diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix index f91cb25..7dd308d 100644 --- a/hosts/desktop1/configuration.nix +++ b/hosts/desktop1/configuration.nix @@ -36,9 +36,6 @@ } ''; - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - environment.systemPackages = with pkgs; [ obsidian libsForQt5.kdenlive diff --git a/hosts/laptop1/configuration.nix b/hosts/laptop1/configuration.nix index 3e1dcf4..f2a041d 100644 --- a/hosts/laptop1/configuration.nix +++ b/hosts/laptop1/configuration.nix @@ -25,9 +25,6 @@ networking.hostName = "laptop1"; - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - environment.systemPackages = with pkgs; [ obsidian libsForQt5.kdenlive diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 1588cfa..f37f763 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -14,6 +14,7 @@ ./de ./office ./comm + ./displaymanager ]; # Timzone and locales (same for all machines so I put it here) diff --git a/modules/nix/displaymanager/default.nix b/modules/nix/displaymanager/default.nix new file mode 100644 index 0000000..beeb006 --- /dev/null +++ b/modules/nix/displaymanager/default.nix @@ -0,0 +1,6 @@ +{ lib, config, pkgs, ... }: +{ + imports = [ + ./sddm.nix + ]; +} diff --git a/modules/nix/displaymanager/sddm.nix b/modules/nix/displaymanager/sddm.nix new file mode 100644 index 0000000..f1a32bd --- /dev/null +++ b/modules/nix/displaymanager/sddm.nix @@ -0,0 +1,16 @@ +{ lib, config, pkgs, ... }: +let + inherit (lib) mkIf mkOption types; +in +{ + options.smayzy.sddm.enable = mkOption { + type = types.bool; + default = false; + description = "sddm"; + }; + + config = mkIf config.smayzy.sddm.enable { + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + }; +} diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix index 4491046..1f4472e 100644 --- a/modules/nix/groups/desktop.nix +++ b/modules/nix/groups/desktop.nix @@ -22,6 +22,7 @@ in office.enable = true; element.enable = true; webcord.enable = true; + sddm.enable = true; }; }; } diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix index bfe0758..6d513e3 100644 --- a/modules/nix/groups/laptop.nix +++ b/modules/nix/groups/laptop.nix @@ -22,6 +22,7 @@ in office.enable= true; webcord.enable = true; element.enable = true; + sddm.enable = true; }; services.logind.lidSwitch = "ignore"; };