fix(nixos): sddm package not being installed

Never use attrset merge operator with `mk*` attrsets since the right hand attrset overrides the left
catppuccin · May 24, 2024 · f229550 · f229550
1 parent 27dc542
commit f229550
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/modules/nixos/sddm.nix b/modules/nixos/sddm.nix
@@ -7,6 +7,7 @@
 let
   inherit (lib)
     mkIf
+    mkMerge
     ctp
     types
     mkOption
@@ -19,6 +20,7 @@ let
   # TODO: remove when 24.05 is stable
   minVersion = "24.05";
 in
+
 {
   options.services.displayManager = ctp.mkVersionedOpts minVersion {
     sddm.catppuccin = ctp.mkCatppuccinOpt "sddm" // {
@@ -48,8 +50,8 @@ in
     };
   };
 
-  config =
-    mkIf enable {
+  config = mkIf enable (mkMerge [
+    {
       environment.systemPackages = [
         (pkgs.catppuccin-sddm.override {
           inherit (cfg)
@@ -62,7 +64,8 @@ in
         })
       ];
     }
-    // mkIf (enable && versionAtLeast ctp.getModuleRelease minVersion) {
+    (mkIf (versionAtLeast ctp.getModuleRelease minVersion) {
       services.displayManager.sddm.theme = "catppuccin-${cfg.flavor}";
-    };
+    })
+  ]);
 }