tree-wide: better separate/name some things

34 files changed, 29 insertions, 18 deletions

diff --git a/ext/default.nix b/ext/default.nix
new file mode 100644
index 0000000..1001f94
--- /dev/null
+++ b/ext/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./openwrt
+    ./terranix
+  ];
+}
diff --git a/ext/openwrt/default.nix b/ext/openwrt/default.nix
new file mode 100644
index 0000000..16f0fb9
--- /dev/null
+++ b/ext/openwrt/default.nix
@@ -0,0 +1,13 @@
+{
+  withSystem,
+  inputs,
+  ...
+}: {
+  flake.legacyPackages.x86_64-linux = withSystem "x86_64-linux" ({pkgs, ...}: {
+    openWrtImages = {
+      turret = pkgs.callPackage ./systems/turret {
+        inherit (inputs) openwrt-imagebuilder;
+      };
+    };
+  });
+}
diff --git a/systems/turret/default.nix b/ext/openwrt/turret/default.nix
index 90ec750..90ec750 100644
--- a/systems/turret/default.nix
+++ b/ext/openwrt/turret/default.nix
diff --git a/systems/turret/files/etc/config/dhcp b/ext/openwrt/turret/files/etc/config/dhcp
index f1ffd42..f1ffd42 100644
--- a/systems/turret/files/etc/config/dhcp
+++ b/ext/openwrt/turret/files/etc/config/dhcp
diff --git a/systems/turret/files/etc/config/dropbear b/ext/openwrt/turret/files/etc/config/dropbear
index 95eb1d5..95eb1d5 100644
--- a/systems/turret/files/etc/config/dropbear
+++ b/ext/openwrt/turret/files/etc/config/dropbear
diff --git a/systems/turret/files/etc/config/firewall b/ext/openwrt/turret/files/etc/config/firewall
index d4f7394..d4f7394 100644
--- a/systems/turret/files/etc/config/firewall
+++ b/ext/openwrt/turret/files/etc/config/firewall
diff --git a/systems/turret/files/etc/config/https-dns-proxy b/ext/openwrt/turret/files/etc/config/https-dns-proxy
index 76e3c60..76e3c60 100644
--- a/systems/turret/files/etc/config/https-dns-proxy
+++ b/ext/openwrt/turret/files/etc/config/https-dns-proxy
diff --git a/systems/turret/files/etc/config/luci b/ext/openwrt/turret/files/etc/config/luci
index 8eb8a9b..8eb8a9b 100644
--- a/systems/turret/files/etc/config/luci
+++ b/ext/openwrt/turret/files/etc/config/luci
diff --git a/systems/turret/files/etc/config/network b/ext/openwrt/turret/files/etc/config/network
index cb24fec..cb24fec 100644
--- a/systems/turret/files/etc/config/network
+++ b/ext/openwrt/turret/files/etc/config/network
diff --git a/systems/turret/files/etc/config/rpcd b/ext/openwrt/turret/files/etc/config/rpcd
index 176c643..176c643 100644
--- a/systems/turret/files/etc/config/rpcd
+++ b/ext/openwrt/turret/files/etc/config/rpcd
diff --git a/systems/turret/files/etc/config/system b/ext/openwrt/turret/files/etc/config/system
index ee3415f..ee3415f 100644
--- a/systems/turret/files/etc/config/system
+++ b/ext/openwrt/turret/files/etc/config/system
diff --git a/systems/turret/files/etc/config/ucitrack b/ext/openwrt/turret/files/etc/config/ucitrack
index bb4cdbc..bb4cdbc 100644
--- a/systems/turret/files/etc/config/ucitrack
+++ b/ext/openwrt/turret/files/etc/config/ucitrack
diff --git a/systems/turret/files/etc/config/uhttpd b/ext/openwrt/turret/files/etc/config/uhttpd
index cb2ff71..cb2ff71 100644
--- a/systems/turret/files/etc/config/uhttpd
+++ b/ext/openwrt/turret/files/etc/config/uhttpd
diff --git a/systems/turret/files/etc/config/wireless b/ext/openwrt/turret/files/etc/config/wireless
index 115fc2c..115fc2c 100644
--- a/systems/turret/files/etc/config/wireless
+++ b/ext/openwrt/turret/files/etc/config/wireless
diff --git a/systems/turret/files/etc/dropbear/authorized_keys b/ext/openwrt/turret/files/etc/dropbear/authorized_keys
index 495c605..495c605 100644
--- a/systems/turret/files/etc/dropbear/authorized_keys
+++ b/ext/openwrt/turret/files/etc/dropbear/authorized_keys
diff --git a/terranix/cloud.nix b/ext/terranix/cloud.nix
index 5ee0113..5ee0113 100644
--- a/terranix/cloud.nix
+++ b/ext/terranix/cloud.nix
diff --git a/terranix/cloudflare/default.nix b/ext/terranix/cloudflare/default.nix
index 80e8e39..80e8e39 100644
--- a/terranix/cloudflare/default.nix
+++ b/ext/terranix/cloudflare/default.nix
diff --git a/terranix/cloudflare/dns.nix b/ext/terranix/cloudflare/dns.nix
index 9618019..9618019 100644
--- a/terranix/cloudflare/dns.nix
+++ b/ext/terranix/cloudflare/dns.nix
diff --git a/terranix/cloudflare/ruleset.nix b/ext/terranix/cloudflare/ruleset.nix
index 1be98aa..1be98aa 100644
--- a/terranix/cloudflare/ruleset.nix
+++ b/ext/terranix/cloudflare/ruleset.nix
diff --git a/terranix/cloudflare/tunnels.nix b/ext/terranix/cloudflare/tunnels.nix
index bea9811..bea9811 100644
--- a/terranix/cloudflare/tunnels.nix
+++ b/ext/terranix/cloudflare/tunnels.nix
diff --git a/terranix/default.nix b/ext/terranix/default.nix
index b27e23d..b27e23d 100644
--- a/terranix/default.nix
+++ b/ext/terranix/default.nix
diff --git a/terranix/tailscale/acl.nix b/ext/terranix/tailscale/acl.nix
index d27d3e1..d27d3e1 100644
--- a/terranix/tailscale/acl.nix
+++ b/ext/terranix/tailscale/acl.nix
diff --git a/terranix/tailscale/default.nix b/ext/terranix/tailscale/default.nix
index 2225fd5..2225fd5 100644
--- a/terranix/tailscale/default.nix
+++ b/ext/terranix/tailscale/default.nix
diff --git a/terranix/tailscale/devices.nix b/ext/terranix/tailscale/devices.nix
index 44ee3f1..44ee3f1 100644
--- a/terranix/tailscale/devices.nix
+++ b/ext/terranix/tailscale/devices.nix
diff --git a/terranix/tailscale/dns.nix b/ext/terranix/tailscale/dns.nix
index 320a24b..320a24b 100644
--- a/terranix/tailscale/dns.nix
+++ b/ext/terranix/tailscale/dns.nix
diff --git a/terranix/tailscale/tags.nix b/ext/terranix/tailscale/tags.nix
index a776756..a776756 100644
--- a/terranix/tailscale/tags.nix
+++ b/ext/terranix/tailscale/tags.nix
diff --git a/terranix/vars.nix b/ext/terranix/vars.nix
index 2f640c2..2f640c2 100644
--- a/terranix/vars.nix
+++ b/ext/terranix/vars.nix
diff --git a/terranix/versions.nix b/ext/terranix/versions.nix
index 53bb5c6..53bb5c6 100644
--- a/terranix/versions.nix
+++ b/ext/terranix/versions.nix
diff --git a/flake.nix b/flake.nix
index 2670aea..e55ce22 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,20 +6,24 @@
     extra-trusted-public-keys = ["getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE="];
   };
 
-  outputs = inputs:
+  outputs = inputs: let
+    inherit ((import ./modules/flake).flake) flakeModules;
+  in
     inputs.parts.lib.mkFlake {inherit inputs;} {
       imports = [
-        ./dev
         ./modules
         ./overlay
         ./systems
         ./users
-        ./terranix
+
+        ./repo # checks, ci, devShells, etc.
+        ./ext # nix expressions for *external*, not so nix-y things
 
         inputs.pre-commit.flakeModule
+
         # dogfooding
-        ./modules/flake/configurations.nix
-        ./modules/flake/terranix.nix
+        flakeModules.configurations
+        flakeModules.terranix
       ];
 
       systems = [
diff --git a/dev/checks.nix b/repo/checks.nix
index cf2b732..cf2b732 100644
--- a/dev/checks.nix
+++ b/repo/checks.nix
diff --git a/dev/ci.nix b/repo/ci.nix
index e33c088..e33c088 100644
--- a/dev/ci.nix
+++ b/repo/ci.nix
diff --git a/dev/default.nix b/repo/default.nix
index d8da3fe..d8da3fe 100644
--- a/dev/default.nix
+++ b/repo/default.nix
diff --git a/dev/shell.nix b/repo/shell.nix
index 7442907..7442907 100644
--- a/dev/shell.nix
+++ b/repo/shell.nix
diff --git a/systems/default.nix b/systems/default.nix
index 964df12..e0fa49b 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -1,8 +1,4 @@
-{
-  withSystem,
-  inputs,
-  ...
-}: {
+{inputs, ...}: {
   imports = [./deploy.nix];
 
   configurations = {
@@ -38,12 +34,4 @@
       };
     };
   };
-
-  flake.legacyPackages.x86_64-linux = withSystem "x86_64-linux" ({pkgs, ...}: {
-    openWrtImages = {
-      turret = pkgs.callPackage ./systems/turret {
-        inherit (inputs) openwrt-imagebuilder;
-      };
-    };
-  });
 }