refactor: simplify lib and clean path

tao3k · Oct 19, 2023 · da531ef · da531ef
1 parent dca17d9
commit da531ef
Show file tree

Hide file tree

Showing 24 changed files with 65 additions and 89 deletions.
diff --git a/lib/mkHome.nix b/lib/mkHome.nix
@@ -3,7 +3,7 @@
   inputs,
   root,
 }:
-userSet: shell: suites:
+module: userSet: shell: suites:
 let
   inherit (root.errors.requiredInputs inputs "lib" [ "home-manager" ])
     home-manager
@@ -18,7 +18,7 @@ in
 {
   imports =
     [
-      home-manager.nixosModules.default
+      home-manager.${module}
       { users.users = userSet; }
       (
         { pkgs, lib, ... }:

diff --git a/templates/hivebus/nix/lib/exporter/pops/__hostsFun/darwinProfiles.nix b/templates/hivebus/nix/lib/exporter/pops/__hostsFun/darwinProfiles.nix
diff --git a/...xporter/pops/__hostsFun/darwinModules.nix → ...porter/pops/__hostsLoad/darwinModules.nix b/...xporter/pops/__hostsFun/darwinModules.nix → ...porter/pops/__hostsLoad/darwinModules.nix
@@ -1,10 +1,6 @@
 { root, inputs }:
-name:
 (root.exporter.pops.nixosModules.addLoadExtender {
   load = {
-    src =
-      root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
-        "darwinModules";
     inputs = {
       inputs = inputs;
     };

diff --git a/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/darwinProfiles.nix b/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/darwinProfiles.nix
@@ -0,0 +1,8 @@
+{ root, inputs }:
+(root.exporter.pops.nixosModules.addLoadExtender {
+  load = {
+    inputs = {
+      inputs = inputs;
+    };
+  };
+})
diff --git a/.../exporter/pops/__hostsFun/homeModules.nix → ...exporter/pops/__hostsLoad/homeModules.nix b/.../exporter/pops/__hostsFun/homeModules.nix → ...exporter/pops/__hostsLoad/homeModules.nix
@@ -2,9 +2,6 @@
 name:
 (root.exporter.pops.homeModules.addLoadExtender {
   load = {
-    src =
-      root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
-        "homeModules";
     inputs = {
       inputs = inputs;
     };

diff --git a/...exporter/pops/__hostsFun/homeProfiles.nix → ...xporter/pops/__hostsLoad/homeProfiles.nix b/...exporter/pops/__hostsFun/homeProfiles.nix → ...xporter/pops/__hostsLoad/homeProfiles.nix
@@ -1,10 +1,6 @@
 { root, inputs }:
-name:
 (root.exporter.pops.homeProfiles.addLoadExtender {
   load = {
-    src =
-      root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
-        "homeProfiles";
     inputs = {
       inputs = inputs;
     };

diff --git a/...exporter/pops/__hostsFun/nixosModules.nix → ...xporter/pops/__hostsLoad/nixosModules.nix b/...exporter/pops/__hostsFun/nixosModules.nix → ...xporter/pops/__hostsLoad/nixosModules.nix
@@ -2,9 +2,6 @@
 name:
 (root.exporter.pops.nixosModules.addLoadExtender {
   load = {
-    src =
-      root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
-        "nixosModules";
     inputs = {
       inputs = inputs;
     };

diff --git a/...xporter/pops/__hostsFun/nixosProfiles.nix → ...porter/pops/__hostsLoad/nixosProfiles.nix b/...xporter/pops/__hostsFun/nixosProfiles.nix → ...porter/pops/__hostsLoad/nixosProfiles.nix
@@ -1,10 +1,6 @@
 { root, inputs }:
-name:
 (root.exporter.pops.nixosProfiles.addLoadExtender {
   load = {
-    src =
-      root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
-        "nixosProfiles";
     inputs = {
       inputs = inputs;
     };

diff --git a/templates/hivebus/nix/lib/exporter/pops/hosts.nix b/templates/hivebus/nix/lib/exporter/pops/hosts.nix
@@ -2,6 +2,7 @@
   lib,
   inputs,
   super,
+  root,
 }:
 let
   hostsDir = lib.attrNames (
@@ -12,7 +13,17 @@ lib.listToAttrs (
   map
     (name: {
       inherit name;
-      value = lib.mapAttrs (_: v: v name) super.hostsFun;
+      value =
+        lib.mapAttrs
+          (
+            n: v:
+            v.addLoadExtender {
+              load.src =
+                root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
+                  n;
+            }
+          )
+          super.hostsLoad;
     })
     hostsDir
 )
diff --git a/templates/hivebus/units/nixos/hosts/darwin/darwinConfiguration.nix b/templates/hivebus/units/nixos/hosts/darwin/darwinConfiguration.nix
@@ -1,5 +1,5 @@
 let
-  inherit (inputs) nixpkgs;
+  inherit (inputs) nixpkgs darwin;
 in
 darwin.lib.darwinSystem rec {
   system = super.layouts.system;

diff --git a/templates/hivebus/units/nixos/hosts/darwin/layouts.nix b/templates/hivebus/units/nixos/hosts/darwin/layouts.nix
@@ -16,16 +16,14 @@ in
   };
 
   darwinSuites = lib.flatten [
-    outputs.hosts.nixos.nixosProfiles.bootstrap
-
-    outputs.darwinModules.layouts.default.homebrew
+    # outputs.darwinModules.layouts.default.homebrew
     # # # --custom profiles
     # outputs.pops.nixosProfiles.layouts.customProfiles.presets.nix
     # outputs.pops.nixosProfiles.layouts.customProfiles.presets.boot
     # outputs.pops.nixosModules.layouts.customModules.boot
 
     # outputs.srvos.default.common.nix
-    (outputs.omnibus.lib.mkHome
+    (outputs.omnibus.lib.mkHome "darwinModule"
       {
         admin = {
           uid = 1000;
@@ -39,10 +37,11 @@ in
     )
   ];
 
-  homeSuites = [
-    outputs.homeProfiles.presets.emacs
-    # outputs.homeProfiles.presets.bat
-    # # # The parent directory of "presets" is categorized as a list type of "suites"
-    # (outputs.homeProfiles.shell { }).default
-  ];
+  homeSuites =
+    [
+      # outputs.homeProfiles.presets.emacs
+      # outputs.homeProfiles.presets.bat
+      # # # The parent directory of "presets" is categorized as a list type of "suites"
+      # (outputs.homeProfiles.shell { }).default
+    ];
 }
diff --git a/templates/hivebus/units/nixos/hosts/nixos/layouts.nix b/templates/hivebus/units/nixos/hosts/nixos/layouts.nix
@@ -26,7 +26,7 @@ in
     # outputs.pops.nixosModules.layouts.customModules.boot
 
     # outputs.srvos.default.common.nix
-    (outputs.omnibus.lib.mkHome
+    (outputs.omnibus.lib.mkHome "nixosModule"
       {
         admin = {
           uid = 1000;

diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsFun/darwinProfiles.nix b/templates/nixos/nix/lib/exporter/pops/__hostsFun/darwinProfiles.nix
diff --git a/...xporter/pops/__hostsFun/darwinModules.nix → ...porter/pops/__hostsLoad/darwinModules.nix b/...xporter/pops/__hostsFun/darwinModules.nix → ...porter/pops/__hostsLoad/darwinModules.nix
@@ -1,10 +1,6 @@
 { root, inputs }:
-name:
 (root.exporter.pops.nixosModules.addLoadExtender {
   load = {
-    src =
-      root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
-        "darwinModules";
     inputs = {
       inputs = inputs;
     };

diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsLoad/darwinProfiles.nix b/templates/nixos/nix/lib/exporter/pops/__hostsLoad/darwinProfiles.nix
@@ -0,0 +1,8 @@
+{ root, inputs }:
+(root.exporter.pops.nixosModules.addLoadExtender {
+  load = {
+    inputs = {
+      inputs = inputs;
+    };
+  };
+})
diff --git a/.../exporter/pops/__hostsFun/homeModules.nix → ...exporter/pops/__hostsLoad/homeModules.nix b/.../exporter/pops/__hostsFun/homeModules.nix → ...exporter/pops/__hostsLoad/homeModules.nix
@@ -2,9 +2,6 @@
 name:
 (root.exporter.pops.homeModules.addLoadExtender {
   load = {
-    src =
-      root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
-        "homeModules";
     inputs = {
       inputs = inputs;
     };

diff --git a/...exporter/pops/__hostsFun/homeProfiles.nix → ...xporter/pops/__hostsLoad/homeProfiles.nix b/...exporter/pops/__hostsFun/homeProfiles.nix → ...xporter/pops/__hostsLoad/homeProfiles.nix
@@ -1,10 +1,6 @@
 { root, inputs }:
-name:
 (root.exporter.pops.homeProfiles.addLoadExtender {
   load = {
-    src =
-      root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
-        "homeProfiles";
     inputs = {
       inputs = inputs;
     };

diff --git a/...exporter/pops/__hostsFun/nixosModules.nix → ...xporter/pops/__hostsLoad/nixosModules.nix b/...exporter/pops/__hostsFun/nixosModules.nix → ...xporter/pops/__hostsLoad/nixosModules.nix
@@ -2,9 +2,6 @@
 name:
 (root.exporter.pops.nixosModules.addLoadExtender {
   load = {
-    src =
-      root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
-        "nixosModules";
     inputs = {
       inputs = inputs;
     };

diff --git a/...xporter/pops/__hostsFun/nixosProfiles.nix → ...porter/pops/__hostsLoad/nixosProfiles.nix b/...xporter/pops/__hostsFun/nixosProfiles.nix → ...porter/pops/__hostsLoad/nixosProfiles.nix
@@ -1,10 +1,6 @@
 { root, inputs }:
-name:
 (root.exporter.pops.nixosProfiles.addLoadExtender {
   load = {
-    src =
-      root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
-        "nixosProfiles";
     inputs = {
       inputs = inputs;
     };

diff --git a/templates/nixos/nix/lib/exporter/pops/hosts.nix b/templates/nixos/nix/lib/exporter/pops/hosts.nix
@@ -2,6 +2,7 @@
   lib,
   inputs,
   super,
+  root,
 }:
 let
   hostsDir = lib.attrNames (
@@ -12,7 +13,17 @@ lib.listToAttrs (
   map
     (name: {
       inherit name;
-      value = lib.mapAttrs (_: v: v name) super.hostsFun;
+      value =
+        lib.mapAttrs
+          (
+            n: v:
+            v.addLoadExtender {
+              load.src =
+                root.filterPopsSrc (inputs.self.outPath + "/units/nixos/hosts/${name}")
+                  n;
+            }
+          )
+          super.hostsLoad;
     })
     hostsDir
 )
diff --git a/templates/nixos/units/nixos/hosts/darwin/darwinConfiguration.nix b/templates/nixos/units/nixos/hosts/darwin/darwinConfiguration.nix
@@ -1,5 +1,5 @@
 let
-  inherit (inputs) nixpkgs;
+  inherit (inputs) nixpkgs darwin;
 in
 darwin.lib.darwinSystem rec {
   system = super.layouts.system;

diff --git a/templates/nixos/units/nixos/hosts/darwin/layouts.nix b/templates/nixos/units/nixos/hosts/darwin/layouts.nix
@@ -16,16 +16,14 @@ in
   };
 
   darwinSuites = lib.flatten [
-    outputs.hosts.nixos.nixosProfiles.bootstrap
-
-    outputs.darwinModules.layouts.default.homebrew
+    # outputs.darwinModules.layouts.default.homebrew
     # # # --custom profiles
     # outputs.pops.nixosProfiles.layouts.customProfiles.presets.nix
     # outputs.pops.nixosProfiles.layouts.customProfiles.presets.boot
     # outputs.pops.nixosModules.layouts.customModules.boot
 
     # outputs.srvos.default.common.nix
-    (outputs.omnibus.lib.mkHome
+    (outputs.omnibus.lib.mkHome "darwinModule"
       {
         admin = {
           uid = 1000;
@@ -39,10 +37,11 @@ in
     )
   ];
 
-  homeSuites = [
-    outputs.homeProfiles.presets.emacs
-    # outputs.homeProfiles.presets.bat
-    # # # The parent directory of "presets" is categorized as a list type of "suites"
-    # (outputs.homeProfiles.shell { }).default
-  ];
+  homeSuites =
+    [
+      # outputs.homeProfiles.presets.emacs
+      # outputs.homeProfiles.presets.bat
+      # # # The parent directory of "presets" is categorized as a list type of "suites"
+      # (outputs.homeProfiles.shell { }).default
+    ];
 }
diff --git a/templates/nixos/units/nixos/hosts/nixos/layouts.nix b/templates/nixos/units/nixos/hosts/nixos/layouts.nix
@@ -26,7 +26,7 @@ in
     # outputs.pops.nixosModules.layouts.customModules.boot
 
     # outputs.srvos.default.common.nix
-    (outputs.omnibus.lib.mkHome
+    (outputs.omnibus.lib.mkHome "nixosModule"
       {
         admin = {
           uid = 1000;

diff --git a/tests/nixos/__fixture/layouts.nix b/tests/nixos/__fixture/layouts.nix
@@ -22,7 +22,7 @@ in
     # # exporter.nixosProfiles.customProfiles.presets.boot
     # outputs.srvos.default.common.nix
 
-    (outputs'.omnibus.lib.mkHome
+    (outputs'.omnibus.lib.mkHome "nixosModule"
       {
         admin = {
           uid = 1000;