chore: clean path

tao3k · Oct 21, 2023 · 9b0ccf1 · 9b0ccf1
1 parent 28e4756
commit 9b0ccf1
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 74 deletions.
diff --git a/local/cells/repo/configs.nix b/local/cells/repo/configs.nix
@@ -15,18 +15,24 @@ let
       inputs' = (inputs.omnibus.pops.flake.setSystem nixpkgs.system).inputs;
     in
     inputs.omnibus.pops.configs.addLoadExtender { load.inputs.inputs = inputs'; };
+  inherit (configs.layouts.default) treefmt lefthook conform;
 in
 {
-  conform'.data = {
-    commit.conventional.scopes = append [
-      "nixosModules"
-      "nixosProfiles"
-      "homeProfiles"
-      "homeModules"
-      "darwinModules"
-      "darwinProfiles"
-      ".*."
-    ];
+  inherit treefmt lefthook;
+  conform = {
+    inherit (conform) default;
+    custom = {
+      data = {
+        commit.conventional.scopes = append [
+          "nixosModules"
+          "nixosProfiles"
+          "homeProfiles"
+          "homeModules"
+          "darwinModules"
+          "darwinProfiles"
+          ".*."
+        ];
+      };
+    };
   };
-  inherit (configs.layouts.default) treefmt lefthook conform;
 }
diff --git a/local/cells/repo/shells.nix b/local/cells/repo/shells.nix
@@ -19,7 +19,7 @@ in
     # It runs the startup hook when entering the shell.
     nixago = [
       (std.lib.dev.mkNixago std.lib.cfg.conform cell.configs.conform.default
-        cell.configs.conform'
+        cell.configs.conform.custom
       )
       (std.lib.dev.mkNixago std.lib.cfg.lefthook cell.configs.lefthook.default)
       (std.lib.dev.mkNixago std.lib.cfg.treefmt cell.configs.treefmt.default)

diff --git a/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/darwinModules.nix b/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/darwinModules.nix
@@ -2,7 +2,8 @@
 (root.exporter.pops.nixosModules.addLoadExtender {
   load = {
     inputs = {
-      inputs = inputs;
+      # only for host
+      # custom = inputs.custom;
     };
   };
 })
diff --git a/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/darwinProfiles.nix b/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/darwinProfiles.nix
@@ -1,8 +1,6 @@
 { root, inputs }:
 (root.exporter.pops.nixosModules.addLoadExtender {
   load = {
-    inputs = {
-      inputs = inputs;
-    };
+    inputs = { };
   };
 })
diff --git a/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/homeModules.nix b/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/homeModules.nix
@@ -1,9 +1,3 @@
 { root, inputs }:
 name:
-(root.exporter.pops.homeModules.addLoadExtender {
-  load = {
-    inputs = {
-      inputs = inputs;
-    };
-  };
-})
+(root.exporter.pops.homeModules.addLoadExtender { load = { }; })
diff --git a/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/homeProfiles.nix b/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/homeProfiles.nix
@@ -1,8 +1,2 @@
 { root, inputs }:
-(root.exporter.pops.homeProfiles.addLoadExtender {
-  load = {
-    inputs = {
-      inputs = inputs;
-    };
-  };
-})
+(root.exporter.pops.homeProfiles.addLoadExtender { load = { }; })
diff --git a/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/nixosModules.nix b/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/nixosModules.nix
@@ -2,8 +2,6 @@
 name:
 (root.exporter.pops.nixosModules.addLoadExtender {
   load = {
-    inputs = {
-      inputs = inputs;
-    };
+    inputs = { };
   };
 })
diff --git a/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/nixosProfiles.nix b/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/nixosProfiles.nix
@@ -1,8 +1,2 @@
 { root, inputs }:
-(root.exporter.pops.nixosProfiles.addLoadExtender {
-  load = {
-    inputs = {
-      inputs = inputs;
-    };
-  };
-})
+(root.exporter.pops.nixosProfiles.addLoadExtender { load = { }; })
diff --git a/templates/hivebus/units/nixos/hosts/darwin/layouts.nix b/templates/hivebus/units/nixos/hosts/darwin/layouts.nix
@@ -1,9 +1,13 @@
+{
+  inputs,
+  self,
+  lib,
+}:
 let
   outputs = inputs.self;
 in
-# self' = inputs.self.hosts.nixos;
 {
-  system = "aarch64-darwin";
+  system = "aarch64-aarch";
 
   data = outputs.local.${self.system}.data;
 

diff --git a/templates/hivebus/units/nixos/hosts/nixos/nixosConfiguration.nix b/templates/hivebus/units/nixos/hosts/nixos/nixosConfiguration.nix
@@ -1,5 +1,5 @@
 let
-  inherit (inputs) nixos;
+  inherit (inputs) nixpkgs;
 in
 nixpkgs.lib.nixosSystem rec {
   system = super.layouts.system;

diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsLoad/darwinModules.nix b/templates/nixos/nix/lib/exporter/pops/__hostsLoad/darwinModules.nix
@@ -2,7 +2,8 @@
 (root.exporter.pops.nixosModules.addLoadExtender {
   load = {
     inputs = {
-      inputs = inputs;
+      # only for host
+      # custom = inputs.custom;
     };
   };
 })
diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsLoad/darwinProfiles.nix b/templates/nixos/nix/lib/exporter/pops/__hostsLoad/darwinProfiles.nix
@@ -1,8 +1,6 @@
 { root, inputs }:
 (root.exporter.pops.nixosModules.addLoadExtender {
   load = {
-    inputs = {
-      inputs = inputs;
-    };
+    inputs = { };
   };
 })
diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsLoad/homeModules.nix b/templates/nixos/nix/lib/exporter/pops/__hostsLoad/homeModules.nix
@@ -1,9 +1,3 @@
 { root, inputs }:
 name:
-(root.exporter.pops.homeModules.addLoadExtender {
-  load = {
-    inputs = {
-      inputs = inputs;
-    };
-  };
-})
+(root.exporter.pops.homeModules.addLoadExtender { load = { }; })
diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsLoad/homeProfiles.nix b/templates/nixos/nix/lib/exporter/pops/__hostsLoad/homeProfiles.nix
@@ -1,8 +1,2 @@
 { root, inputs }:
-(root.exporter.pops.homeProfiles.addLoadExtender {
-  load = {
-    inputs = {
-      inputs = inputs;
-    };
-  };
-})
+(root.exporter.pops.homeProfiles.addLoadExtender { load = { }; })
diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsLoad/nixosModules.nix b/templates/nixos/nix/lib/exporter/pops/__hostsLoad/nixosModules.nix
@@ -2,8 +2,6 @@
 name:
 (root.exporter.pops.nixosModules.addLoadExtender {
   load = {
-    inputs = {
-      inputs = inputs;
-    };
+    inputs = { };
   };
 })
diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsLoad/nixosProfiles.nix b/templates/nixos/nix/lib/exporter/pops/__hostsLoad/nixosProfiles.nix
@@ -1,8 +1,2 @@
 { root, inputs }:
-(root.exporter.pops.nixosProfiles.addLoadExtender {
-  load = {
-    inputs = {
-      inputs = inputs;
-    };
-  };
-})
+(root.exporter.pops.nixosProfiles.addLoadExtender { load = { }; })
diff --git a/templates/nixos/nix/lib/exporter/pops/subflake.nix b/templates/nixos/nix/lib/exporter/pops/subflake.nix
@@ -5,9 +5,7 @@
       subflake = omnibus.pops.flake.setInitInputs ../../../lock;
     in
     {
-      inputs = subflake.inputs // {
-        nixpkgs = subflake.inputs.nixpkgs.legacyPackages;
-      };
+      inputs = subflake.inputs;
     }
   )
 ))