From 3d8485d011090a2e25ee30631619eff318f6abed Mon Sep 17 00:00:00 2001 From: uku Date: Fri, 6 Sep 2024 17:38:22 +0200 Subject: [PATCH] feat(kde): switch to sddm --- configs/desktop.nix | 4 ---- programs/gnome.nix | 8 +++++++- programs/hyprland.nix | 8 +++++++- programs/kde.nix | 8 +++++++- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/configs/desktop.nix b/configs/desktop.nix index 1120176..1d62980 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -115,10 +115,6 @@ xkb.layout = "fr"; displayManager = { lightdm.enable = false; - gdm = { - enable = true; - wayland = true; - }; }; }; diff --git a/programs/gnome.nix b/programs/gnome.nix index 5ea8015..5d03326 100644 --- a/programs/gnome.nix +++ b/programs/gnome.nix @@ -1,7 +1,13 @@ {pkgs, ...}: { services = { xserver.desktopManager.gnome.enable = true; - displayManager.defaultSession = "gnome"; + displayManager = { + defaultSession = "gnome"; + gdm = { + enable = true; + wayland = true; + }; + }; }; hm.programs.gnome-shell = { diff --git a/programs/hyprland.nix b/programs/hyprland.nix index f47ad8a..66881bb 100644 --- a/programs/hyprland.nix +++ b/programs/hyprland.nix @@ -12,7 +12,13 @@ programs.hyprland.enable = true; - services.displayManager.defaultSession = "hyprland"; + services.displayManager = { + defaultSession = "hyprland"; + gdm = { + enable = true; + wayland = true; + }; + }; xdg.portal.extraPortals = with pkgs; [xdg-desktop-portal-gtk]; diff --git a/programs/kde.nix b/programs/kde.nix index 1d38686..f09af6a 100644 --- a/programs/kde.nix +++ b/programs/kde.nix @@ -3,7 +3,13 @@ camasca, ... }: { - services.desktopManager.plasma6.enable = true; + services = { + desktopManager.plasma6.enable = true; + displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + }; environment = { variables.SSH_AUTH_SOCK = "/run/user/1000/ssh-agent";