diff --git a/base/gui-programs.nix b/base/gui-programs.nix index a3d86ab..3269b27 100644 --- a/base/gui-programs.nix +++ b/base/gui-programs.nix @@ -18,8 +18,6 @@ in { }; config = mkIf config.my.gui.enable { - my.displayManager.sddm.enable = true; - programs.gnupg.agent = { enable = true; enableSSHSupport = true; diff --git a/hosts/boreal/default.nix b/hosts/boreal/default.nix index 12b56fa..65a0d30 100644 --- a/hosts/boreal/default.nix +++ b/hosts/boreal/default.nix @@ -111,5 +111,6 @@ programs.waybar.enable = true; programs.foot.enable = true; services.displayManager.sddm.wayland.enable = true; + my.displayManager.gdm.enable = true; services.power-profiles-daemon.enable = true; } diff --git a/hosts/talos/default.nix b/hosts/talos/default.nix index bf11f17..b0d77f8 100644 --- a/hosts/talos/default.nix +++ b/hosts/talos/default.nix @@ -154,6 +154,7 @@ }; # Enable the KDE Plasma Desktop Environment. + my.displayManager.sddm.enable = true; services.desktopManager.plasma6.enable = true; services.desktopManager.cosmic.enable = true; services.power-profiles-daemon.enable = true; diff --git a/modules/default.nix b/modules/default.nix index ec72f4c..29a6e45 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,5 +1,6 @@ {...}: { imports = [ + ./gdm.nix ./sddm.nix ./secrets ./wakeonwlan.nix diff --git a/modules/gdm.nix b/modules/gdm.nix new file mode 100644 index 0000000..2bca452 --- /dev/null +++ b/modules/gdm.nix @@ -0,0 +1,23 @@ +{ + config, + lib, + pkgs, + ... +}: let + inherit + (lib) + mkEnableOption + mkIf + ; + + cfg = config.my.displayManager.gdm; +in { + options.my.displayManager.gdm.enable = mkEnableOption "GDM setup"; + + config = mkIf cfg.enable { + services.displayManager.gdm = { + enable = true; + wayland = true; + }; + }; +}