chore: reorg paths

tao3k · Oct 4, 2023 · 2346609 · 2346609
1 parent 7188078
commit 2346609
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 9 deletions.
diff --git a/templates/nixos/flake.nix b/templates/nixos/flake.nix
@@ -48,7 +48,7 @@
     {
       lib =
         (inputs.omnibus.exporters.addLoadExtender {
-          src = ./lib;
+          src = ./nix/lib;
           inputs = {
             inherit inputs eachSystem;
             omnibus = inputs.omnibus.lib;

diff --git a/templates/nixos/local/secrets/age/test.age b/templates/nixos/local/secrets/age/test.age
@@ -0,0 +1 @@
+plaintext
diff --git a/templates/nixos/local/secrets/sops/plaintext.yaml b/templates/nixos/local/secrets/sops/plaintext.yaml
@@ -0,0 +1 @@
+test: xxx
diff --git a/templates/nixos/lib/__lock/flake.lock → templates/nixos/nix/lib/__lock/flake.lock b/templates/nixos/lib/__lock/flake.lock → templates/nixos/nix/lib/__lock/flake.lock
diff --git a/templates/nixos/lib/__lock/flake.nix → templates/nixos/nix/lib/__lock/flake.nix b/templates/nixos/lib/__lock/flake.nix → templates/nixos/nix/lib/__lock/flake.nix
diff --git a/templates/nixos/lib/exporters.nix → templates/nixos/nix/lib/exporters.nix b/templates/nixos/lib/exporters.nix → templates/nixos/nix/lib/exporters.nix
@@ -9,7 +9,7 @@ in
 {
   hosts =
     (inputs.omnibus.exporters.addLoadExtender {
-      src = ../nixos/hosts;
+      src = ../../nixos/hosts;
       inputs = inputs // {
         self'.lib = super;
         omnibus = inputs.omnibus.lib // {
@@ -34,7 +34,8 @@ in
         }).outputs.default.loadDataAll;
     in
     {
-      data = (loadDataAll.addLoadExtender { src = ../local/data; }).outputs.default;
+      data =
+        (loadDataAll.addLoadExtender { src = ../../local/data; }).outputs.default;
     }
   );
 

diff --git a/templates/nixos/lib/inputs.nix → templates/nixos/nix/lib/inputs.nix b/templates/nixos/lib/inputs.nix → templates/nixos/nix/lib/inputs.nix
diff --git a/templates/nixos/lib/nixos.nix → templates/nixos/nix/lib/nixos.nix b/templates/nixos/lib/nixos.nix → templates/nixos/nix/lib/nixos.nix
@@ -1,29 +1,31 @@
 {
   loadHomeModules =
-    (omnibus.loadHomeModules.addLoadExtender { src = ../nixos/homeModules; });
+    (omnibus.loadHomeModules.addLoadExtender { src = ../../nixos/homeModules; });
 
   loadHomeProfiles =
     (omnibus.loadHomeProfiles.addLoadExtender {
-      src = ../nixos/homeProfiles;
+      src = ../../nixos/homeProfiles;
       inputs = {
         homeModules = self.loadHomeModules.outputs.default;
       };
     });
 
   loadNixOSProfiles =
     (omnibus.loadNixOSProfiles.addLoadExtender {
-      src = ../nixos/nixosProfiles;
+      src = ../../nixos/nixosProfiles;
       inputs = {
         nixosModules = self.loadNixOSModules.outputs.default;
       };
     });
 
   loadNixOSModules =
-    (omnibus.loadNixOSModules.addLoadExtender { src = ../nixos/nixosModules; });
+    (omnibus.loadNixOSModules.addLoadExtender { src = ../../nixos/nixosModules; });
 
   loadDarwinProfiles =
-    (omnibus.loadNixOSProfiles.addLoadExtender { src = ../nixos/darwinProfiles; });
+    (omnibus.loadNixOSProfiles.addLoadExtender {
+      src = ../../nixos/darwinProfiles;
+    });
 
   loadDarwinModules =
-    (omnibus.loadNixOSModules.addLoadExtender { src = ../nixos/darwinModules; });
+    (omnibus.loadNixOSModules.addLoadExtender { src = ../../nixos/darwinModules; });
 }
diff --git a/templates/nixos/lib/omnibus.nix → templates/nixos/nix/lib/omnibus.nix b/templates/nixos/lib/omnibus.nix → templates/nixos/nix/lib/omnibus.nix
diff --git a/templates/nixos/packages/hello.nix → templates/nixos/nix/packages/hello.nix b/templates/nixos/packages/hello.nix → templates/nixos/nix/packages/hello.nix