30 files changed, 44 insertions, 33 deletions

diff --git a/flake.nix b/flake.nix
index 110064b..2d4d0f9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,13 +56,13 @@
       ];
 
       imports = [
-        ./nix/flake/apps.nix
-        ./nix/flake/checks.nix
-        ./nix/flake/devshells.nix
-        ./nix/flake/formatter.nix
-        ./nix/flake/hosts.nix
-        ./nix/flake/overlays.nix
-        ./nix/flake/packages.nix
+        ./flake/apps.nix
+        ./flake/checks.nix
+        ./flake/devshells.nix
+        ./flake/formatter.nix
+        ./flake/hosts.nix
+        ./flake/overlays.nix
+        ./flake/packages.nix
       ];
     };
 }
diff --git a/nix/flake/apps.nix b/flake/apps.nix
index ef764eb..e0b23f4 100644
--- a/nix/flake/apps.nix
+++ b/flake/apps.nix
@@ -1,9 +1,9 @@
-{ ... }:
+{ self, ... }:
 {
   perSystem =
     { pkgs, ... }:
     let
-      mkFcunyNet = import ../../src/fcuny.net { inherit pkgs; };
+      mkFcunyNet = import "${self}/src/fcuny.net" { inherit pkgs; };
     in
     {
       apps = {
diff --git a/nix/flake/checks.nix b/flake/checks.nix
index 87d4a7f..87d4a7f 100644
--- a/nix/flake/checks.nix
+++ b/flake/checks.nix
diff --git a/nix/flake/devshells.nix b/flake/devshells.nix
index 339a8f4..d28c4b3 100644
--- a/nix/flake/devshells.nix
+++ b/flake/devshells.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ self, inputs, ... }:
 {
   perSystem =
     { system, pkgs, ... }:
@@ -35,8 +35,13 @@
         };
 
       pre-commit-check = mkPreCommitHooks ./.;
-      scripts = import ../../nix/scripts {
-        inherit pkgs system inputs;
+      scripts = import "${self}/scripts" {
+        inherit
+          pkgs
+          self
+          system
+          inputs
+          ;
       };
     in
     {
diff --git a/nix/flake/formatter.nix b/flake/formatter.nix
index 44c0190..44c0190 100644
--- a/nix/flake/formatter.nix
+++ b/flake/formatter.nix
diff --git a/nix/flake/hosts.nix b/flake/hosts.nix
index d3454bf..ecfcca1 100644
--- a/nix/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -71,14 +71,14 @@ let
     inputs.agenix.nixosModules.age
     inputs.disko.nixosModules.disko
     inputs.home-manager.nixosModules.home-manager
-    "${self}/nix/modules/default.nix"
+    "${self}/modules/default.nix"
   ];
 
   darwinDefaultModules = [
     nixSettings
     inputs.agenix.darwinModules.age
     inputs.home-manager.darwinModules.home-manager
-    "${self}/nix/modules/default-darwin.nix"
+    "${self}/modules/default-darwin.nix"
   ];
 
   darwinConfigurations = mapAttrs' (
diff --git a/nix/flake/overlays.nix b/flake/overlays.nix
index 83eadd0..83eadd0 100644
--- a/nix/flake/overlays.nix
+++ b/flake/overlays.nix
diff --git a/nix/flake/packages.nix b/flake/packages.nix
index a166803..68f43c0 100644
--- a/nix/flake/packages.nix
+++ b/flake/packages.nix
@@ -1,9 +1,9 @@
-{ ... }:
+{ self, ... }:
 {
   perSystem =
     { pkgs, ... }:
     let
-      mkFcunyNet = import ../../src/fcuny.net { inherit pkgs; };
+      mkFcunyNet = import "${self}/src/fcuny.net" { inherit pkgs; };
     in
     {
       packages = {
diff --git a/nix/tofu/backups.nix b/infra/tf/backups.nix
index e76ed2e..e76ed2e 100644
--- a/nix/tofu/backups.nix
+++ b/infra/tf/backups.nix
diff --git a/nix/tofu/dns.nix b/infra/tf/dns.nix
index df0ed65..df0ed65 100644
--- a/nix/tofu/dns.nix
+++ b/infra/tf/dns.nix
diff --git a/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix b/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix
index 182c64c..0364728 100644
--- a/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix
+++ b/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix
@@ -7,9 +7,9 @@
 {
 
   imports = [
-    "${self}/nix/profiles/home-manager.nix"
-    "${self}/nix/profiles/darwin.nix"
-    "${self}/nix/profiles/nix.nix"
+    "${self}/profiles/home-manager.nix"
+    "${self}/profiles/darwin.nix"
+    "${self}/profiles/nix.nix"
   ];
 
   system.primaryUser = adminUser.name;
diff --git a/machines/darwin/aarch64-darwin/mba-m2.nix b/machines/darwin/aarch64-darwin/mba-m2.nix
index 5cf7071..6f41583 100644
--- a/machines/darwin/aarch64-darwin/mba-m2.nix
+++ b/machines/darwin/aarch64-darwin/mba-m2.nix
@@ -6,9 +6,9 @@
 }:
 {
   imports = [
-    "${self}/nix/profiles/home-manager.nix"
-    "${self}/nix/profiles/darwin.nix"
-    "${self}/nix/profiles/nix.nix"
+    "${self}/profiles/home-manager.nix"
+    "${self}/profiles/darwin.nix"
+    "${self}/profiles/nix.nix"
   ];
 
   system.primaryUser = adminUser.name;
diff --git a/machines/nixos/x86_64-linux/vm-synology.nix b/machines/nixos/x86_64-linux/vm-synology.nix
index 3c51bb1..a86e18b 100644
--- a/machines/nixos/x86_64-linux/vm-synology.nix
+++ b/machines/nixos/x86_64-linux/vm-synology.nix
@@ -22,10 +22,10 @@
   };
 
   imports = [
-    "${self}/nix/profiles/git-server.nix"
-    "${self}/nix/profiles/hardware/synology.nix"
-    "${self}/nix/profiles/disk/vm.nix"
-    "${self}/nix/profiles/server.nix"
+    "${self}/profiles/git-server.nix"
+    "${self}/profiles/hardware/synology.nix"
+    "${self}/profiles/disk/vm.nix"
+    "${self}/profiles/server.nix"
     # ./backups.nix
     # ./ingress.nix
     # ./nginx.nix
diff --git a/nix/modules/default-darwin.nix b/modules/default-darwin.nix
index b42a079..b42a079 100644
--- a/nix/modules/default-darwin.nix
+++ b/modules/default-darwin.nix
diff --git a/nix/modules/default.nix b/modules/default.nix
index b42a079..b42a079 100644
--- a/nix/modules/default.nix
+++ b/modules/default.nix
diff --git a/nix/modules/fcuny-net.nix b/modules/fcuny-net.nix
index eb5bf95..eb5bf95 100644
--- a/nix/modules/fcuny-net.nix
+++ b/modules/fcuny-net.nix
diff --git a/nix/modules/home.nix b/modules/home.nix
index 6b6b518..6b6b518 100644
--- a/nix/modules/home.nix
+++ b/modules/home.nix
diff --git a/nix/modules/host-config.nix b/modules/host-config.nix
index b10d85f..b10d85f 100644
--- a/nix/modules/host-config.nix
+++ b/modules/host-config.nix
diff --git a/nix/profiles/darwin.nix b/profiles/darwin.nix
index e355b72..e355b72 100644
--- a/nix/profiles/darwin.nix
+++ b/profiles/darwin.nix
diff --git a/nix/profiles/disk/vm.nix b/profiles/disk/vm.nix
index 1641339..1641339 100644
--- a/nix/profiles/disk/vm.nix
+++ b/profiles/disk/vm.nix
diff --git a/nix/profiles/git-server.nix b/profiles/git-server.nix
index 27eebc7..27eebc7 100644
--- a/nix/profiles/git-server.nix
+++ b/profiles/git-server.nix
diff --git a/nix/profiles/hardware/synology.nix b/profiles/hardware/synology.nix
index ad1fd3f..ad1fd3f 100644
--- a/nix/profiles/hardware/synology.nix
+++ b/profiles/hardware/synology.nix
diff --git a/nix/profiles/home-manager.nix b/profiles/home-manager.nix
index 3a81cce..3a81cce 100644
--- a/nix/profiles/home-manager.nix
+++ b/profiles/home-manager.nix
diff --git a/nix/profiles/nix.nix b/profiles/nix.nix
index acfe151..acfe151 100644
--- a/nix/profiles/nix.nix
+++ b/profiles/nix.nix
diff --git a/nix/profiles/server.nix b/profiles/server.nix
index 1588314..1588314 100644
--- a/nix/profiles/server.nix
+++ b/profiles/server.nix
diff --git a/scripts/common.nix b/scripts/common.nix
new file mode 100644
index 0000000..931480c
--- /dev/null
+++ b/scripts/common.nix
@@ -0,0 +1,4 @@
+{ pkgs }:
+[
+  (pkgs.writeScriptBin "update-deps" "nix flake update --commit-lock-file")
+]
diff --git a/nix/scripts/darwin.nix b/scripts/darwin.nix
index c1bbbde..c1bbbde 100644
--- a/nix/scripts/darwin.nix
+++ b/scripts/darwin.nix
diff --git a/nix/scripts/default.nix b/scripts/default.nix
index 90851df..bf91760 100644
--- a/nix/scripts/default.nix
+++ b/scripts/default.nix
@@ -2,19 +2,23 @@
   pkgs,
   system,
   inputs,
+  self,
 }:
 let
   common = import ./common.nix { inherit pkgs; };
+  infra = import ./infra.nix { inherit self pkgs; };
   darwin = import ./darwin.nix { inherit pkgs system inputs; };
   linux = import ./linux.nix { inherit pkgs system inputs; };
 in
 {
   common = common;
+  infra = infra;
   darwin = if pkgs.lib.hasSuffix "darwin" system then darwin else [ ];
   linux = if pkgs.lib.hasSuffix "linux" system then linux else [ ];
 
   all =
     common
+    ++ infra
     ++ (if pkgs.lib.hasSuffix "darwin" system then darwin else [ ])
     ++ (if pkgs.lib.hasSuffix "linux" system then linux else [ ]);
 }
diff --git a/nix/scripts/common.nix b/scripts/infra.nix
index b457ea2..aa9b0d6 100644
--- a/nix/scripts/common.nix
+++ b/scripts/infra.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ self, pkgs }:
 let
   tofuSetup = ''
     tofu_setup() {
@@ -22,13 +22,13 @@ let
 
       # Install terraform configs
       ${pkgs.coreutils}/bin/install -Dm 0644 ${
-        import ../tofu/backups.nix {
+        import "${self}/infra/tf/backups.nix" {
           inherit pkgs;
         }
       } "$TMPDIR/backups/backups.tf.json"
 
       ${pkgs.coreutils}/bin/install -Dm 0644 ${
-        import ../tofu/dns.nix {
+        import "${self}/infra/tf/dns.nix" {
           inherit pkgs;
         }
       } "$TMPDIR/cloudflare/cloudflare-dns.tf.json"
@@ -43,8 +43,6 @@ let
   '';
 in
 [
-  (pkgs.writeScriptBin "update-deps" "nix flake update --commit-lock-file")
-
   (pkgs.writeShellScriptBin "gcloud-auth" ''
     set -xeuo pipefail
     ${pkgs.google-cloud-sdk}/bin/gcloud auth print-identity-token > /dev/null 2>&1 || \
@@ -53,7 +51,7 @@ in
     ${pkgs.google-cloud-sdk}/bin/gcloud auth application-default login --quiet
   '')
 
-  (pkgs.writeShellScriptBin "tofu-plan" ''
+  (pkgs.writeShellScriptBin "tf-plan" ''
     set -xeuo pipefail
 
     ${tofuSetup}
@@ -66,7 +64,7 @@ in
     CLOUDFLARE_API_TOKEN="$CLOUDFLARE_API_TOKEN" ${pkgs.opentofu}/bin/tofu -chdir="$TMPDIR/cloudflare" plan
   '')
 
-  (pkgs.writeShellScriptBin "tofu-apply" ''
+  (pkgs.writeShellScriptBin "tf-apply" ''
     set -xeuo pipefail
 
     ${tofuSetup}
diff --git a/nix/scripts/linux.nix b/scripts/linux.nix
index b44c86f..b44c86f 100644
--- a/nix/scripts/linux.nix
+++ b/scripts/linux.nix