refactor(modules): use standalone attrset for lib

We don't need to extend nixpkgs.lib anymore
catppuccin · Nov 27, 2024 · b666798 · b666798
1 parent d870483
commit b666798
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/modules/global.nix b/modules/global.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  catppuccinLib = (import ./lib/mk-ext-lib.nix { inherit config lib pkgs; }).ctp;
+  catppuccinLib = import ./lib { inherit config lib pkgs; };
 in
 
 {

diff --git a/modules/lib/default.nix b/modules/lib/default.nix
@@ -4,11 +4,8 @@
   pkgs,
   ...
 }:
-let
-  # this is a recursive attribute with all the functions below
-  inherit (lib) ctp;
-in
-{
+
+lib.makeExtensible (ctp: {
   types = {
     flavor = lib.types.enum [
       "latte"
@@ -153,4 +150,4 @@ in
   # [ module ] -> [ module ]
   # Imports a list of modules with the current library
   applyToModules = map (lib.flip lib.modules.importApply { catppuccinLib = ctp; });
-}
+})
diff --git a/modules/lib/mk-ext-lib.nix b/modules/lib/mk-ext-lib.nix
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     }:
     let
-      catppuccinLib = (import ./lib/mk-ext-lib.nix { inherit config lib pkgs; }).ctp;
+      catppuccinLib = import ./lib { inherit config lib pkgs; };
     in
     {
@@ Expand Down @@