diff --git a/modules/home/programs/defaults.nix b/modules/home/programs/defaults.nix index 22e56223..52d39b20 100644 --- a/modules/home/programs/defaults.nix +++ b/modules/home/programs/defaults.nix @@ -51,7 +51,6 @@ in type = nullOr (enum [ "swaylock" "gtklock" - "cosmic-greeter" ]); default = "gtklock"; description = '' diff --git a/modules/nixos/programs/cosmic.nix b/modules/nixos/programs/cosmic.nix deleted file mode 100644 index 355b603a..00000000 --- a/modules/nixos/programs/cosmic.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - pkgs, - config, - ... -}: -let - inherit (lib) mkIf mkEnableOption; - - cfg = config.garden.programs.cosmic; -in -{ - options.garden.programs.cosmic = { - enable = mkEnableOption "enable cosmic desktop environment"; - }; - - config = mkIf cfg.enable { - services.desktopManager.cosmic.enable = true; - - environment.cosmic.excludePackages = [ - pkgs.cosmic-edit - pkgs.cosmic-term - pkgs.cosmic-store - ]; - - garden.environment.loginManager = "cosmic-greeter"; - }; -} diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix index efc9b608..df46b7ad 100644 --- a/modules/nixos/programs/default.nix +++ b/modules/nixos/programs/default.nix @@ -1,7 +1,6 @@ { imports = [ # keep-sorted start - ./cosmic.nix ./graphical.nix ./hyprland.nix # keep-sorted end diff --git a/modules/nixos/security/polkit.nix b/modules/nixos/security/polkit.nix index d5cd3de3..4ead4f34 100644 --- a/modules/nixos/security/polkit.nix +++ b/modules/nixos/security/polkit.nix @@ -5,7 +5,6 @@ polkit.enable = true; # this should only be installed on graphical systems - soteria.enable = - config.garden.profiles.graphical.enable && !config.services.desktopManager.cosmic.enable; + soteria.enable = config.garden.profiles.graphical.enable; }; } diff --git a/modules/nixos/system/loginManager.nix b/modules/nixos/system/loginManager.nix index 646b9d24..0f5dd42b 100644 --- a/modules/nixos/system/loginManager.nix +++ b/modules/nixos/system/loginManager.nix @@ -5,64 +5,32 @@ ... }: let - inherit (lib) - mkIf - mkMerge - getExe - mkOption - mkOptionDefault - concatStringsSep - ; - inherit (lib.types) nullOr enum; + inherit (lib) getExe concatStringsSep; sessionData = config.services.displayManager.sessionData.desktops; sessionPath = concatStringsSep ":" [ "${sessionData}/share/xsessions" "${sessionData}/share/wayland-sessions" ]; - - cfg = config.garden.environment.loginManager; in { - options.garden.environment.loginManager = mkOption { - type = nullOr (enum [ - "greetd" - "cosmic-greeter" - ]); - description = "The login manager to be used by the system."; - }; - - config = mkMerge [ - { - garden.environment.loginManager = mkOptionDefault ( - if config.garden.profiles.graphical.enable then "greetd" else null - ); - } - - (mkIf (cfg == "greetd") { - services.greetd = { - enable = true; - restart = true; - useTextGreeter = true; + services.greetd = { + enable = true; + restart = true; + useTextGreeter = true; - settings = { - default_session = { - user = "greeter"; - command = concatStringsSep " " [ - (getExe pkgs.tuigreet) - "--time" - "--remember" - "--remember-user-session" - "--asterisks" - "--sessions '${sessionPath}'" - ]; - }; - }; + settings = { + default_session = { + user = "greeter"; + command = concatStringsSep " " [ + (getExe pkgs.tuigreet) + "--time" + "--remember" + "--remember-user-session" + "--asterisks" + "--sessions '${sessionPath}'" + ]; }; - }) - - (mkIf (cfg == "cosmic-greeter") { - services.displayManager.cosmic-greeter.enable = true; - }) - ]; + }; + }; } diff --git a/modules/nixos/system/seatd.nix b/modules/nixos/system/seatd.nix index 20549d46..f27d4152 100644 --- a/modules/nixos/system/seatd.nix +++ b/modules/nixos/system/seatd.nix @@ -1,6 +1,6 @@ { config, ... }: { services.seatd = { - enable = config.garden.profiles.graphical.enable && !config.services.desktopManager.cosmic.enable; + inherit (config.garden.profiles.graphical) enable; }; }