♻️ a little reshuffling... gonna try some things

flake.lock

@@ -81,11 +81,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768836546,
-        "narHash": "sha256-nJZkTamcXXMW+SMYiGFB6lB8l0aJw0xjssfN8xYd/Fs=",
+        "lastModified": 1769978395,
+        "narHash": "sha256-gj1yP3spUb1vGtaF5qPhshd2j0cg4xf51pklDsIm19Q=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b56c5ad14fcf8b5bc887463552483bf000ca562a",
+        "rev": "984708c34d3495a518e6ab6b8633469bbca2f77a",
         "type": "github"
       },
       "original": {
@@ -151,11 +151,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764234087,
-        "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
+        "lastModified": 1769813415,
+        "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
+        "rev": "8946737ff703382fda7623b9fab071d037e897d5",
         "type": "github"
       },
       "original": {
@@ -166,11 +166,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1768783163,
-        "narHash": "sha256-tLj4KcRDLakrlpvboTJDKsrp6z2XLwyQ4Zmo+w8KsY4=",
+        "lastModified": 1770015011,
+        "narHash": "sha256-7vUo0qWCl/rip+fzr6lcMlz9I0tN/8m7d5Bla/rS2kk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bde09022887110deb780067364a0818e89258968",
+        "rev": "f08e6b11a5ed43637a8ac444dd44118bc7d273b9",
         "type": "github"
       },
       "original": {
@@ -205,11 +205,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768834646,
-        "narHash": "sha256-sZq+qm+Pg1jw+hxncm5LDujLxgPcAop3G55jPSvWhfU=",
+        "lastModified": 1769939035,
+        "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "2f927757d32bcd2b11e5017bdb9f11fd9719af53",
+        "rev": "a8ca480175326551d6c4121498316261cbb5b260",
         "type": "github"
       },
       "original": {
@@ -384,11 +384,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768709255,
-        "narHash": "sha256-aigyBfxI20FRtqajVMYXHtj5gHXENY2gLAXEhfJ8/WM=",
+        "lastModified": 1769921679,
+        "narHash": "sha256-twBMKGQvaztZQxFxbZnkg7y/50BW9yjtCBWwdjtOZew=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "5e8fae80726b66e9fec023d21cd3b3e638597aa9",
+        "rev": "1e89149dcfc229e7e2ae24a8030f124a31e4f24f",
         "type": "github"
       },
       "original": {

hosts/aristotle/configuration.nix

@@ -4,11 +4,11 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../modules/base/nixos.nix
+    ../../nix/modules/base/nixos.nix
     raspberry-pi-nix.nixosModules.raspberry-pi
-    ../../modules/ipfs/cluster.nix
-    # ../../modules/k3s/agent.nix
-    ../../modules/sops
+    ../../nix/modules/ipfs/cluster.nix
+    # ../../nix/modules/k3s/agent.nix
+    ../../nix/modules/sops
   ];
 
   # See: https://github.com/NixOS/nixos-hardware/issues/858

hosts/epicurus/darwin-configuration.nix

@@ -0,0 +1,10 @@
+{ ... }:
+{
+  imports = [
+    ./homebrew.nix
+
+    ../../nix/modules/base/darwin.nix
+    ../../nix/modules/builder
+    ../../nix/modules/dev
+  ];
+}

hosts/heraclitus/darwin-configuration.nix

@@ -3,9 +3,9 @@
   imports = [
     ./homebrew.nix
 
-    ../../modules/base/darwin.nix
-    ../../modules/dev
-    ../../modules/builder
+    ../../nix/modules/base/darwin.nix
+    ../../nix/modules/dev
+    ../../nix/modules/builder
   ];
 
   system = {

hosts/plato/configuration.nix

@@ -12,17 +12,17 @@ in
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../modules/base/nixos.nix
+    ../../nix/modules/base/nixos.nix
 
-    ../../modules/coredns
-    ../../modules/drone
-    ../../modules/drone/runner-docker.nix
-    ../../modules/gitea
-    # ../../modules/k3s/server.nix
-    ../../modules/matrix
-    ../../modules/minecraft
-    ../../modules/postgresql
-    ../../modules/sops
+    ../../nix/modules/coredns
+    ../../nix/modules/drone
+    ../../nix/modules/drone/runner-docker.nix
+    ../../nix/modules/gitea
+    # ../../nix/modules/k3s/server.nix
+    ../../nix/modules/matrix
+    ../../nix/modules/minecraft
+    ../../nix/modules/postgresql
+    ../../nix/modules/sops
   ];
   boot = {
     binfmt.emulatedSystems = [ "aarch64-linux" ];

hosts/socrates/configuration.nix

@@ -3,19 +3,19 @@
   imports = [
     ./hardware-configuration.nix
     ./networking.nix # generated at runtime by nixos-infect
-    ../../modules/base/nixos.nix
+    ../../nix/modules/base/nixos.nix
 
-    ../../modules/akkoma
-    ../../modules/akkoma/nginx.nix
-    ../../modules/coredns
-    ../../modules/code-server/nginx.nix
-    ../../modules/drone/nginx.nix
-    ../../modules/gitea/nginx.nix
-    ../../modules/home-assistant/nginx.nix
-    ../../modules/ipfs/gateway.nix
-    ../../modules/matrix/nginx.nix
-    ../../modules/minecraft/proxy.nix
-    ../../modules/sops
+    ../../nix/modules/akkoma
+    ../../nix/modules/akkoma/nginx.nix
+    ../../nix/modules/coredns
+    ../../nix/modules/code-server/nginx.nix
+    ../../nix/modules/drone/nginx.nix
+    ../../nix/modules/gitea/nginx.nix
+    ../../nix/modules/home-assistant/nginx.nix
+    ../../nix/modules/ipfs/gateway.nix
+    ../../nix/modules/matrix/nginx.nix
+    ../../nix/modules/minecraft/proxy.nix
+    ../../nix/modules/sops
   ];
 
   boot.tmp.cleanOnBoot = true;

nix/darwin.nix

@@ -24,6 +24,6 @@ let
     };
 in
 {
-  epicurus = mkDarwin "epicurus" [ ./hosts/epicurus/darwin-configuration.nix ];
-  heraclitus = mkDarwin "heraclitus" [ ./hosts/heraclitus/darwin-configuration.nix ];
+  epicurus = mkDarwin "epicurus" [ ../hosts/epicurus/darwin-configuration.nix ];
+  heraclitus = mkDarwin "heraclitus" [ ../hosts/heraclitus/darwin-configuration.nix ];
 }

nix/hosts/epicurus/darwin-configuration.nix

@@ -1,10 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./homebrew.nix
-
-    ../../modules/base/darwin.nix
-    ../../modules/builder
-    ../../modules/dev
-  ];
-}

nix/nixos.nix

@@ -28,11 +28,11 @@ let
 in
 {
   # Aristotle
-  agent = mkSystem "agent" [ ./hosts/aristotle/configuration.nix ];
-  form = mkSystem "form" [ ./hosts/aristotle/configuration.nix ];
-  matter = mkSystem "matter" [ ./hosts/aristotle/configuration.nix ];
-  purpose = mkSystem "purpose" [ ./hosts/aristotle/configuration.nix ];
+  agent = mkSystem "agent" [ ../hosts/aristotle/configuration.nix ];
+  form = mkSystem "form" [ ../hosts/aristotle/configuration.nix ];
+  matter = mkSystem "matter" [ ../hosts/aristotle/configuration.nix ];
+  purpose = mkSystem "purpose" [ ../hosts/aristotle/configuration.nix ];
 
-  plato = mkSystem "plato" [ ./hosts/plato/configuration.nix ];
-  socrates = mkSystem "socrates" [ ./hosts/socrates/configuration.nix ];
+  plato = mkSystem "plato" [ ../hosts/plato/configuration.nix ];
+  socrates = mkSystem "socrates" [ ../hosts/socrates/configuration.nix ];
 }