modules: move desktop networking to desktop

18 files changed, 19 insertions, 18 deletions

diff --git a/modules/core/networking/default.nix b/modules/core/networking/default.nix
index c26099c..2874fa3 100644
--- a/modules/core/networking/default.nix
+++ b/modules/core/networking/default.nix
@@ -1,18 +1,8 @@
 { secrets, ... }:
 {
   imports = [
-    ./firewall
-    ./vpn
-    ./caddy.nix
-    ./dhcpcd.nix
-    ./i2p.nix
-    ./ipv6.nix
     ./loopback.nix
-    ./networkmanager.nix
-    ./optimise.nix
-    ./resolved.nix
-    ./tor.nix
-    ./upnp.nix
+    ./tailscale.nix
   ];
 
   # https://discourse.nixos.org/t/rebuild-error-failed-to-start-network-manager-wait-online/41977/2
diff --git a/modules/core/networking/vpn/tailscale.nix b/modules/core/networking/tailscale.nix
index 0228915..0228915 100644
--- a/modules/core/networking/vpn/tailscale.nix
+++ b/modules/core/networking/tailscale.nix
diff --git a/modules/core/networking/vpn/default.nix b/modules/core/networking/vpn/default.nix
deleted file mode 100644
index 92a11b0..0000000
--- a/modules/core/networking/vpn/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./pia.nix
-    ./tailscale.nix
-  ];
-}
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index f50ffba..f20e009 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,4 +1,6 @@
 { config, ... }:
 {
+  imports = [ ./networking ];
+
   sops.defaultSopsFile = ../../secrets/${config.networking.hostName}.yaml;
 }
diff --git a/modules/core/networking/caddy.nix b/modules/desktop/networking/caddy.nix
index efba3f6..efba3f6 100644
--- a/modules/core/networking/caddy.nix
+++ b/modules/desktop/networking/caddy.nix
diff --git a/modules/desktop/networking/default.nix b/modules/desktop/networking/default.nix
new file mode 100644
index 0000000..3148acd
--- /dev/null
+++ b/modules/desktop/networking/default.nix
@@ -0,0 +1,15 @@
+{
+  imports = [
+    ./firewall
+    ./caddy.nix
+    ./dhcpcd.nix
+    ./i2p.nix
+    ./ipv6.nix
+    ./networkmanager.nix
+    ./optimise.nix
+    ./pia.nix
+    ./resolved.nix
+    ./tor.nix
+    ./upnp.nix
+  ];
+}
diff --git a/modules/core/networking/dhcpcd.nix b/modules/desktop/networking/dhcpcd.nix
index f46b657..f46b657 100644
--- a/modules/core/networking/dhcpcd.nix
+++ b/modules/desktop/networking/dhcpcd.nix
diff --git a/modules/core/networking/firewall/default.nix b/modules/desktop/networking/firewall/default.nix
index 074f398..074f398 100644
--- a/modules/core/networking/firewall/default.nix
+++ b/modules/desktop/networking/firewall/default.nix
diff --git a/modules/core/networking/firewall/fail2ban.nix b/modules/desktop/networking/firewall/fail2ban.nix
index 6311b14..6311b14 100644
--- a/modules/core/networking/firewall/fail2ban.nix
+++ b/modules/desktop/networking/firewall/fail2ban.nix
diff --git a/modules/core/networking/i2p.nix b/modules/desktop/networking/i2p.nix
index 8bca73e..8bca73e 100644
--- a/modules/core/networking/i2p.nix
+++ b/modules/desktop/networking/i2p.nix
diff --git a/modules/core/networking/ipv6.nix b/modules/desktop/networking/ipv6.nix
index 274c1ae..274c1ae 100644
--- a/modules/core/networking/ipv6.nix
+++ b/modules/desktop/networking/ipv6.nix
diff --git a/modules/core/networking/networkmanager.nix b/modules/desktop/networking/networkmanager.nix
index 7ef0e04..7ef0e04 100644
--- a/modules/core/networking/networkmanager.nix
+++ b/modules/desktop/networking/networkmanager.nix
diff --git a/modules/core/networking/optimise.nix b/modules/desktop/networking/optimise.nix
index c6f2bec..c6f2bec 100644
--- a/modules/core/networking/optimise.nix
+++ b/modules/desktop/networking/optimise.nix
diff --git a/modules/core/networking/vpn/pia.nix b/modules/desktop/networking/pia.nix
index d52dbf8..d52dbf8 100644
--- a/modules/core/networking/vpn/pia.nix
+++ b/modules/desktop/networking/pia.nix
diff --git a/modules/core/networking/resolved.nix b/modules/desktop/networking/resolved.nix
index 82effbe..82effbe 100644
--- a/modules/core/networking/resolved.nix
+++ b/modules/desktop/networking/resolved.nix
diff --git a/modules/core/networking/tor.nix b/modules/desktop/networking/tor.nix
index dfbfb3a..dfbfb3a 100644
--- a/modules/core/networking/tor.nix
+++ b/modules/desktop/networking/tor.nix
diff --git a/modules/core/networking/upnp.nix b/modules/desktop/networking/upnp.nix
index 998592a..998592a 100644
--- a/modules/core/networking/upnp.nix
+++ b/modules/desktop/networking/upnp.nix
diff --git a/modules/server/default.nix b/modules/server/default.nix
index f5ba744..c5df823 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   imports = [
-    ../core/networking/vpn/tailscale.nix
+    ../core/networking/tailscale.nix
     ../core/security/sops.nix
     ../core/nix
     ./networking