2 files changed, 7 insertions, 28 deletions
diff --git a/machines/taupe/default.nix b/machines/taupe/default.nix
index 4f60eab..caa5a83 100644
--- a/machines/taupe/default.nix
+++ b/machines/taupe/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../modules/common.nix
-    ../../modules/vpn.nix
+    ../../modules/vpn/egress.nix
 
     ./hardware.nix
     ./devices.nix
@@ -11,20 +11,13 @@
 
   foundation = {
     www = {
-      enable = true;
+      enable = false;
 
-      public = true;
-      tailnet = true;
+      public = false;
+      tailnet = false;
     };
 
-    monitoring = {
-      client.enable = true;
-      services = [
-        "base"
-      ];
-    };
-
-    wireguard.server.externalInterface = "enp1s0";
+    monitoring.client.enable = false;
   };
 
   system.stateVersion = "25.05";
diff --git a/machines/taupe/devices.nix b/machines/taupe/devices.nix
index 5dcfee1..a07f794 100644
--- a/machines/taupe/devices.nix
+++ b/machines/taupe/devices.nix
@@ -3,7 +3,6 @@
 {
   boot = {
     loader.systemd-boot.enable = true;
-    kernelModules = [ "wireguard" ];
   };
 
   zramSwap = {
@@ -21,8 +20,7 @@
     ];
   };
 
-  # Static IPv6 network configuration
-  # + soliciting of IPv4 via DHCP.
+  # static ipv6 + dhcp ipv4
   systemd.network.enable = true;
   systemd.network.networks."10-wan" = {
     name = "enp1s0";
@@ -34,18 +32,6 @@
   services.resolved = {
     llmnr = "false";
     extraConfig = "MulticastDNS=no";
-    dnssec = "false"; 
-  };
-  
-  virtualisation.docker.daemon.settings = {
-    "experimental" = true;
-    "ipv6" = true;
-    "ip6tables" = true;
-    "fixed-cidr-v6" = "fc00:d0c:b1b1::/48";
-    "bip" = "172.17.0.1/24";
-    "default-address-pools" = [
-      { base = "172.17.0.0/16"; size = 24; }
-      { base = "fc00:d0c::/32"; size = 48; }
-    ];
+    dnssec = "false";
   };
 }