diff --git a/flake.nix b/flake.nix
index 72660e5..e0b6d06 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,17 +5,17 @@
     substituters = [
       "https://cache.nixos.org/?priority=1&want-mass-query=true"
       "https://nix-community.cachix.org/?priority=10&want-mass-query=true"
-      "https://attic.nayeonie.com/nix-cache"
+      #"https://attic.nayeonie.com/nix-cache"
     ];
     trusted-substituters = [
       "https://cache.nixos.org"
       "https://nix-community.cachix.org"
-      "https://attic.nayeonie.com/nix-cache"
+      #"https://attic.nayeonie.com/nix-cache"
     ];
     trusted-public-keys = [
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "nix-cache:grGRsHhqNDhkEuTODvHJXYmoCClntC+U8XAJQzwMaZM="
+      #"nix-cache:grGRsHhqNDhkEuTODvHJXYmoCClntC+U8XAJQzwMaZM="
     ];
     trusted-users = [ "root" ];
     allow-import-from-derivation = true;
diff --git a/systems/artemision/private-wifi.nix b/systems/artemision/private-wifi.nix
new file mode 100644
index 0000000..6c3a8ea
--- /dev/null
+++ b/systems/artemision/private-wifi.nix
@@ -0,0 +1,19 @@
+{ ... }:
+{
+  networking.nameservers = [
+    "9.9.9.9"
+    "1.1.1.1"
+    "192.168.76.1"
+  ];
+
+  services.resolved = {
+    enable = true;
+    dnssec = "false";
+    domains = [ "~." ];
+    fallbackDns = [
+      "1.1.1.1#one.one.one.one"
+      "1.0.0.1#one.one.one.one"
+    ];
+    dnsovertls = "true";
+  };
+}
diff --git a/systems/artemision/wifi.nix b/systems/artemision/wifi.nix
index 72463e1..ef6949f 100644
--- a/systems/artemision/wifi.nix
+++ b/systems/artemision/wifi.nix
@@ -5,6 +5,9 @@ let
   public_wifi = false;
 in
 {
+  imports = lib.optionals (!public_wifi) [
+    ./private-wifi.nix
+  ];
   networking.wireless = {
     enable = true;
     secretsFile = config.sops.secrets."wifi-env".path;
@@ -42,24 +45,3 @@ in
     };
   };
 }
-//
-
-  lib.mkIf (!public_wifi) {
-
-    networking.nameservers = [
-      "9.9.9.9"
-      "1.1.1.1"
-      "192.168.76.1"
-    ];
-
-    services.resolved = {
-      enable = true;
-      dnssec = "false";
-      domains = [ "~." ];
-      fallbackDns = [
-        "1.1.1.1#one.one.one.one"
-        "1.0.0.1#one.one.one.one"
-      ];
-      dnsovertls = "true";
-    };
-  }