fix(modules): ensure default sources are applied to catppuccin.sources

catppuccin · May 13, 2024 · c3ce53e · c3ce53e
1 parent c22eacf
commit c3ce53e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/modules/home-manager/globals.nix b/modules/home-manager/globals.nix
@@ -17,6 +17,10 @@
     sources = lib.mkOption {
       type = lib.types.lazyAttrsOf lib.types.raw;
       default = defaultSources;
+      # HACK!
+      # without this, overriding one source will delete
+      # all others. -getchoo
+      apply = lib.recursiveUpdate defaultSources;
       description = "Port sources used across all options";
     };
   };

diff --git a/modules/nixos/globals.nix b/modules/nixos/globals.nix
@@ -17,6 +17,10 @@
     sources = lib.mkOption {
       type = lib.types.lazyAttrsOf lib.types.raw;
       default = defaultSources;
+      # HACK!
+      # without this, overriding one source will delete
+      # all others. -getchoo
+      apply = lib.recursiveUpdate defaultSources;
       description = "Port sources used across all options";
     };
   };

diff --git a/test.nix b/test.nix
@@ -1,7 +1,20 @@
-{ testers, home-manager }:
+{ testers, fetchFromGitHub, home-manager }:
 let
   common = {
-    catppuccin.enable = true;
+    catppuccin = {
+      enable = true;
+      sources = {
+        # this is used to ensure that we are able to apply
+        # source overrides without breaking the other sources
+        palette = fetchFromGitHub {
+          owner = "catppuccin";
+          repo = "palette";
+          rev = "16726028c518b0b94841de57cf51f14c095d43d8"; # refs/tags/1.1.1~1
+          hash = "sha256-qZjMlZFTzJotOYjURRQMsiOdR2XGGba8XzXwx4+v9tk=";
+        };
+      };
+
+    };
   };
 
   # shorthand for enabling a module