diff --git a/flake.lock b/flake.lock
index bc66bdf..40dc22c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724994893,
-        "narHash": "sha256-yutISDGg6HUaZqCaa54EcsfTwew3vhNtt/FNXBBo44g=",
+        "lastModified": 1725189302,
+        "narHash": "sha256-IhXok/kwQqtusPsoguQLCHA+h6gKvgdCrkhIaN+kByA=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "c8d3157d1f768e382de5526bb38e74d2245cad04",
+        "rev": "7c4b53a7d9f3a3df902b3fddf2ae245ef20ebcda",
         "type": "github"
       },
       "original": {
@@ -198,11 +198,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1724435763,
-        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
+        "lastModified": 1725180166,
+        "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
+        "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
         "type": "github"
       },
       "original": {
@@ -213,11 +213,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1724547350,
-        "narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=",
+        "lastModified": 1725152544,
+        "narHash": "sha256-Tm344cnFM9f2YZsgWtJduvhIrvLr3Bi8J4Xc+UZDKYE=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d",
+        "rev": "7f0b9e4fbd91826cb9ce6babbc11c87903191051",
         "type": "github"
       },
       "original": {
@@ -234,11 +234,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724893087,
-        "narHash": "sha256-M3+Z8SSpzKPQ+/vw9a99G9HfqKWbVGzhFz4p3KAX0NI=",
+        "lastModified": 1725238763,
+        "narHash": "sha256-HYsDDHdjqpZf8XUZum0d+EjMSd88oDSvyunDKxzDJro=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "0dd0205bc3f6d602ddb62aaece5f62a8715a9e85",
+        "rev": "89db25d85b0324cbec7c944c157c9550e5c576db",
         "type": "github"
       },
       "original": {
@@ -313,11 +313,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1725067332,
-        "narHash": "sha256-bMi5zhDwR6jdmN5mBHEu9gQQf9CibIEasA/6mc34Iek=",
+        "lastModified": 1725194671,
+        "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "192e7407cc66e2eccc3a6c5ad3834dd62fae3800",
+        "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
         "type": "github"
       },
       "original": {
@@ -374,11 +374,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1723501126,
-        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
+        "lastModified": 1725201042,
+        "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
+        "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7",
         "type": "github"
       },
       "original": {
diff --git a/nix/darwin.nix b/nix/darwin.nix
index 845a792..0bfe1d6 100644
--- a/nix/darwin.nix
+++ b/nix/darwin.nix
@@ -17,6 +17,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 ];
 }
diff --git a/hosts/aristotle/configuration.nix b/nix/hosts/aristotle/configuration.nix
similarity index 100%
rename from hosts/aristotle/configuration.nix
rename to nix/hosts/aristotle/configuration.nix
diff --git a/hosts/aristotle/hardware-configuration.nix b/nix/hosts/aristotle/hardware-configuration.nix
similarity index 100%
rename from hosts/aristotle/hardware-configuration.nix
rename to nix/hosts/aristotle/hardware-configuration.nix
diff --git a/hosts/epicurus/darwin-configuration.nix b/nix/hosts/epicurus/darwin-configuration.nix
similarity index 100%
rename from hosts/epicurus/darwin-configuration.nix
rename to nix/hosts/epicurus/darwin-configuration.nix
diff --git a/hosts/epicurus/homebrew.nix b/nix/hosts/epicurus/homebrew.nix
similarity index 100%
rename from hosts/epicurus/homebrew.nix
rename to nix/hosts/epicurus/homebrew.nix
diff --git a/hosts/heraclitus/darwin-configuration.nix b/nix/hosts/heraclitus/darwin-configuration.nix
similarity index 100%
rename from hosts/heraclitus/darwin-configuration.nix
rename to nix/hosts/heraclitus/darwin-configuration.nix
diff --git a/hosts/heraclitus/homebrew.nix b/nix/hosts/heraclitus/homebrew.nix
similarity index 100%
rename from hosts/heraclitus/homebrew.nix
rename to nix/hosts/heraclitus/homebrew.nix
diff --git a/hosts/plato/configuration.nix b/nix/hosts/plato/configuration.nix
similarity index 100%
rename from hosts/plato/configuration.nix
rename to nix/hosts/plato/configuration.nix
diff --git a/hosts/plato/hardware-configuration.nix b/nix/hosts/plato/hardware-configuration.nix
similarity index 100%
rename from hosts/plato/hardware-configuration.nix
rename to nix/hosts/plato/hardware-configuration.nix
diff --git a/hosts/socrates/configuration.nix b/nix/hosts/socrates/configuration.nix
similarity index 100%
rename from hosts/socrates/configuration.nix
rename to nix/hosts/socrates/configuration.nix
diff --git a/hosts/socrates/hardware-configuration.nix b/nix/hosts/socrates/hardware-configuration.nix
similarity index 100%
rename from hosts/socrates/hardware-configuration.nix
rename to nix/hosts/socrates/hardware-configuration.nix
diff --git a/hosts/socrates/networking.nix b/nix/hosts/socrates/networking.nix
similarity index 100%
rename from hosts/socrates/networking.nix
rename to nix/hosts/socrates/networking.nix
diff --git a/modules/akkoma/default.nix b/nix/modules/akkoma/default.nix
similarity index 100%
rename from modules/akkoma/default.nix
rename to nix/modules/akkoma/default.nix
diff --git a/modules/akkoma/nginx.nix b/nix/modules/akkoma/nginx.nix
similarity index 100%
rename from modules/akkoma/nginx.nix
rename to nix/modules/akkoma/nginx.nix
diff --git a/modules/base/common.nix b/nix/modules/base/common.nix
similarity index 100%
rename from modules/base/common.nix
rename to nix/modules/base/common.nix
diff --git a/modules/base/darwin.nix b/nix/modules/base/darwin.nix
similarity index 100%
rename from modules/base/darwin.nix
rename to nix/modules/base/darwin.nix
diff --git a/modules/base/nixos.nix b/nix/modules/base/nixos.nix
similarity index 100%
rename from modules/base/nixos.nix
rename to nix/modules/base/nixos.nix
diff --git a/modules/builder/default.nix b/nix/modules/builder/default.nix
similarity index 100%
rename from modules/builder/default.nix
rename to nix/modules/builder/default.nix
diff --git a/modules/code-server/default.nix b/nix/modules/code-server/default.nix
similarity index 100%
rename from modules/code-server/default.nix
rename to nix/modules/code-server/default.nix
diff --git a/modules/code-server/nginx.nix b/nix/modules/code-server/nginx.nix
similarity index 100%
rename from modules/code-server/nginx.nix
rename to nix/modules/code-server/nginx.nix
diff --git a/modules/coredns/default.nix b/nix/modules/coredns/default.nix
similarity index 100%
rename from modules/coredns/default.nix
rename to nix/modules/coredns/default.nix
diff --git a/modules/coredns/walkah.lab.zone b/nix/modules/coredns/walkah.lab.zone
similarity index 100%
rename from modules/coredns/walkah.lab.zone
rename to nix/modules/coredns/walkah.lab.zone
diff --git a/modules/dev/default.nix b/nix/modules/dev/default.nix
similarity index 100%
rename from modules/dev/default.nix
rename to nix/modules/dev/default.nix
diff --git a/modules/drone/default.nix b/nix/modules/drone/default.nix
similarity index 100%
rename from modules/drone/default.nix
rename to nix/modules/drone/default.nix
diff --git a/modules/drone/nginx.nix b/nix/modules/drone/nginx.nix
similarity index 100%
rename from modules/drone/nginx.nix
rename to nix/modules/drone/nginx.nix
diff --git a/modules/drone/runner-docker.nix b/nix/modules/drone/runner-docker.nix
similarity index 100%
rename from modules/drone/runner-docker.nix
rename to nix/modules/drone/runner-docker.nix
diff --git a/modules/drone/runner-exec.nix b/nix/modules/drone/runner-exec.nix
similarity index 100%
rename from modules/drone/runner-exec.nix
rename to nix/modules/drone/runner-exec.nix
diff --git a/modules/gitea/default.nix b/nix/modules/gitea/default.nix
similarity index 100%
rename from modules/gitea/default.nix
rename to nix/modules/gitea/default.nix
diff --git a/modules/gitea/nginx.nix b/nix/modules/gitea/nginx.nix
similarity index 100%
rename from modules/gitea/nginx.nix
rename to nix/modules/gitea/nginx.nix
diff --git a/modules/home-assistant/nginx.nix b/nix/modules/home-assistant/nginx.nix
similarity index 100%
rename from modules/home-assistant/nginx.nix
rename to nix/modules/home-assistant/nginx.nix
diff --git a/modules/ipfs/badbits.deny b/nix/modules/ipfs/badbits.deny
similarity index 100%
rename from modules/ipfs/badbits.deny
rename to nix/modules/ipfs/badbits.deny
diff --git a/modules/ipfs/cluster.nix b/nix/modules/ipfs/cluster.nix
similarity index 100%
rename from modules/ipfs/cluster.nix
rename to nix/modules/ipfs/cluster.nix
diff --git a/modules/ipfs/default.nix b/nix/modules/ipfs/default.nix
similarity index 100%
rename from modules/ipfs/default.nix
rename to nix/modules/ipfs/default.nix
diff --git a/modules/ipfs/gateway.nix b/nix/modules/ipfs/gateway.nix
similarity index 100%
rename from modules/ipfs/gateway.nix
rename to nix/modules/ipfs/gateway.nix
diff --git a/modules/matrix/default.nix b/nix/modules/matrix/default.nix
similarity index 100%
rename from modules/matrix/default.nix
rename to nix/modules/matrix/default.nix
diff --git a/modules/matrix/nginx.nix b/nix/modules/matrix/nginx.nix
similarity index 100%
rename from modules/matrix/nginx.nix
rename to nix/modules/matrix/nginx.nix
diff --git a/modules/minecraft/default.nix b/nix/modules/minecraft/default.nix
similarity index 100%
rename from modules/minecraft/default.nix
rename to nix/modules/minecraft/default.nix
diff --git a/modules/minecraft/proxy.nix b/nix/modules/minecraft/proxy.nix
similarity index 100%
rename from modules/minecraft/proxy.nix
rename to nix/modules/minecraft/proxy.nix
diff --git a/modules/monitoring/default.nix b/nix/modules/monitoring/default.nix
similarity index 100%
rename from modules/monitoring/default.nix
rename to nix/modules/monitoring/default.nix
diff --git a/modules/postgresql/default.nix b/nix/modules/postgresql/default.nix
similarity index 100%
rename from modules/postgresql/default.nix
rename to nix/modules/postgresql/default.nix
diff --git a/modules/sops/default.nix b/nix/modules/sops/default.nix
similarity index 100%
rename from modules/sops/default.nix
rename to nix/modules/sops/default.nix
diff --git a/modules/traefik/default.nix b/nix/modules/traefik/default.nix
similarity index 100%
rename from modules/traefik/default.nix
rename to nix/modules/traefik/default.nix
diff --git a/nix/nixos.nix b/nix/nixos.nix
index 304d480..d1481c2 100644
--- a/nix/nixos.nix
+++ b/nix/nixos.nix
@@ -19,11 +19,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 ];
 }
diff --git a/overlays/default.nix b/nix/overlays/default.nix
similarity index 100%
rename from overlays/default.nix
rename to nix/overlays/default.nix
diff --git a/secrets/secrets.yaml b/nix/secrets/secrets.yaml
similarity index 100%
rename from secrets/secrets.yaml
rename to nix/secrets/secrets.yaml
diff --git a/services/ipfs-cluster.nix b/nix/services/ipfs-cluster.nix
similarity index 100%
rename from services/ipfs-cluster.nix
rename to nix/services/ipfs-cluster.nix
diff --git a/users/default.nix b/nix/users/default.nix
similarity index 100%
rename from users/default.nix
rename to nix/users/default.nix
diff --git a/users/walkah.nix b/nix/users/walkah.nix
similarity index 100%
rename from users/walkah.nix
rename to nix/users/walkah.nix