From dfaaa338cbb7158dce00f10f8b2ff66bccee39d9 Mon Sep 17 00:00:00 2001 From: uku Date: Thu, 2 Jan 2025 15:28:14 +0100 Subject: [PATCH 1/2] fix(gnome): change renamed options and disable ssh agent --- programs/gnome.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/gnome.nix b/programs/gnome.nix index 784f4b5..9fec1d9 100644 --- a/programs/gnome.nix +++ b/programs/gnome.nix @@ -1,10 +1,10 @@ -{ pkgs, ... }: +{ lib, pkgs, ... }: { services = { - xserver.desktopManager.gnome.enable = true; - displayManager = { - defaultSession = "gnome"; - gdm = { + displayManager.defaultSession = "gnome"; + xserver = { + desktopManager.gnome.enable = true; + displayManager.gdm = { enable = true; wayland = true; }; @@ -20,6 +20,10 @@ ]; }; + # ssh-agent is provided by gnome-keyring-daemon + # (mabye soon by gcr, see NixOS/nixpkgs#140824) + programs.ssh.startAgent = lib.mkForce false; + environment = with pkgs; { systemPackages = [ gnome-tweaks ]; From dd26a9346641ba95448fa60a671e3b1c2d064203 Mon Sep 17 00:00:00 2001 From: uku Date: Thu, 2 Jan 2025 15:28:25 +0100 Subject: [PATCH 2/2] feat(desktop): plasma6 -> gnome --- configs/desktop.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/configs/desktop.nix b/configs/desktop.nix index e13c883..b84e037 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -12,12 +12,7 @@ ./client.nix ../programs/ghostty.nix - ../programs/kde.nix - # ../programs/vscode.nix - - # the world if hyprland - # ../programs/hyprland.nix - # ../programs/alacritty.nix + ../programs/gnome.nix ]; boot = {