diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 3afc522..5ea8571 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -21,6 +21,8 @@ ./modules/firefox ./modules/flatpak ./modules/steam + ./modules/ly + ./modules/sddm ./modules/services/autoupgrade ./modules/sops ./hosts/${hwconfig.hostname} @@ -133,13 +135,6 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - (catppuccin-sddm.override { - flavor = "mocha"; - # font = ""; - fontSize = "16"; - #background; - loginBackground = false; - }) kdenlive system-config-printer libreoffice @@ -237,6 +232,8 @@ MANPAGER = "nvim +Man!"; EDITOR = "nvim"; }; + kk.loginManagers.sddm.enable = true; + hardware = { graphics = { enable = true; @@ -368,13 +365,6 @@ # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "24.05"; # Did you read the comment? - services.xserver.enable = true; - services.displayManager.sddm = { - enable = true; - theme = "catppuccin-mocha"; - package = pkgs.kdePackages.sddm; - wayland.enable = false; - }; nix = { settings = { experimental-features = ["nix-command" "flakes"]; diff --git a/nixos/modules/ly/default.nix b/nixos/modules/ly/default.nix new file mode 100644 index 0000000..fb5c10f --- /dev/null +++ b/nixos/modules/ly/default.nix @@ -0,0 +1,16 @@ +{ + config, + pkgs, + lib, + ... +}: let + cfg = config.kk.loginManagers.ly; +in { + options.kk.loginManagers.ly = { + enable = lib.mkEnableOption "Enable ly as login manager"; + }; + config = lib.mkIf cfg.enable { + services.xserver.enable = true; + services.displayManager.ly.enable = true; + }; +} diff --git a/nixos/modules/sddm/default.nix b/nixos/modules/sddm/default.nix new file mode 100644 index 0000000..18fd19d --- /dev/null +++ b/nixos/modules/sddm/default.nix @@ -0,0 +1,30 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.kk.loginManagers.sddm; +in { + options.kk.loginManagers.sddm = { + enable = lib.mkEnableOption "Enable sddm as login manager"; + }; + config = lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + (catppuccin-sddm.override { + flavor = "mocha"; + # font = ""; + fontSize = "16"; + #background; + loginBackground = false; + }) + ]; + services.xserver.enable = true; + services.displayManager.sddm = { + enable = true; + theme = "catppuccin-mocha"; + package = pkgs.kdePackages.sddm; + wayland.enable = false; + }; + }; +}