4/5: export mkLib (will update post latter)

nixos-asia · Feb 26, 2024 · 331664a · 331664a
1 parent fc4fa3d
commit 331664a
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 35 deletions.
diff --git a/global/nix-modules/4/flake.nix b/global/nix-modules/4/flake.nix
@@ -7,27 +7,31 @@
       # TODO: Change this to x86_64-linux if you are on Linux
       system = "aarch64-darwin";
       pkgs = nixpkgs.legacyPackages.${system};
-      lib = pkgs.lib;
-      lsdFor = settings:
-        let
-          result = lib.evalModules {
-            modules = [
-              ./lsd.nix
-              settings
-            ];
-            specialArgs = { inherit pkgs; };
+      mkLib = pkgs: {
+        lsdFor = settings:
+          let
+            result = pkgs.lib.evalModules {
+              modules = [
+                ./lsd.nix
+                settings
+              ];
+              specialArgs = { inherit pkgs; };
+            };
+          in
+          result.config.lsd.package;
+        # ⤵️ A common module for re-use in other modules (see below)
+        common = {
+          lsd = {
+            long = pkgs.lib.mkDefault true;
           };
-        in
-        result.config.lsd.package;
-      # ⤵️ A common module for re-use in other modules (see below)
-      common = {
-        lsd = {
-          long = lib.mkDefault true;
         };
       };
+      inherit (mkLib pkgs) lsdFor common;
     in
     {
-      inherit common; # For use in 5/flake.nix
+      # Let's export some things for use in 5/flake.nix
+      inherit mkLib;
+
       packages.${system} = {
         default = lsdFor {
           # ⤵️ Here, we import the common module

diff --git a/global/nix-modules/5/flake.lock b/global/nix-modules/5/flake.lock
diff --git a/global/nix-modules/5/flake.nix b/global/nix-modules/5/flake.nix
@@ -9,31 +9,19 @@
       # TODO: Change this to x86_64-linux if you are on Linux
       system = "aarch64-darwin";
       pkgs = nixpkgs.legacyPackages.${system};
-      lib = pkgs.lib;
-      lsdFor = settings:
-        let
-          result = lib.evalModules {
-            modules = [
-              # ⤵️ We import flake4's module directly here, by file path.
-              (flake4 + /lsd.nix)
-              # ⤵️ We can also reference the module directly.
-              flake4.common
-              settings
-            ];
-            specialArgs = { inherit pkgs; };
-          };
-        in
-        result.config.lsd.package;
+      # ⤵️ We import the library from 4/flake.nix
+      lsdLib = flake4.mkLib pkgs;
     in
     {
       packages.${system} = {
-        default = lsdFor {
+        default = lsdLib.lsdFor {
+          imports = [ lsdLib.common ];
           lsd.dir = "/";
         };
-        home = lsdFor {
+        home = lsdLib.lsdFor {
           lsd.dir = "$HOME";
         };
-        downloads = lsdFor {
+        downloads = lsdLib.lsdFor {
           lsd = {
             dir = "$HOME/Downloads";
             tree = true;