diff --git a/machines/luna/modules.nix b/machines/luna/modules.nix
index f1798f8..8789749 100644
--- a/machines/luna/modules.nix
+++ b/machines/luna/modules.nix
@@ -9,6 +9,7 @@
     base = {
       nix.enable = true;
       locale.enable = true;
+      secrets.enable = true;
     };
 
     boot = {
diff --git a/machines/solis/modules.nix b/machines/solis/modules.nix
index c5b257f..0c9e32e 100644
--- a/machines/solis/modules.nix
+++ b/machines/solis/modules.nix
@@ -9,6 +9,7 @@
     base = {
       nix.enable = true;
       locale.enable = true;
+      secrets.enable = true;
     };
 
     boot = {
diff --git a/machines/terra/modules.nix b/machines/terra/modules.nix
index bfa5c93..a015328 100644
--- a/machines/terra/modules.nix
+++ b/machines/terra/modules.nix
@@ -9,6 +9,7 @@
     base = {
       nix.enable = true;
       locale.enable = true;
+      secrets.enable = true;
     };
 
     boot = {
diff --git a/modules/hardware/wifi.nix b/modules/hardware/wifi.nix
index 1975692..88f5456 100644
--- a/modules/hardware/wifi.nix
+++ b/modules/hardware/wifi.nix
@@ -13,7 +13,30 @@ in {
   };
 
   config = mkIf cfg.enable {
-    networking.networkmanager.enable = true;
-    users.users.horseman.extraGroups = ["networkmanager"];
+    networking.wireless = {
+      enable = true;
+      userControlled.enable = true;
+
+      secretsFile = toString config.age.secrets.wifi.path;
+
+      networks = {
+        "Wi-Fi de Ruiters" = {
+          pskRaw = "ext:psk_wifideruiter";
+        };
+
+        "kargadoor" = {
+          pskRaw = "ext:psk_kargadoor";
+        };
+
+        "eduroam" = {
+          auth = ''
+            key_mgmt=WPA-EAP
+            eap=PWD
+            identity="ext:identity_eduroam"
+            password="ext:psk_eduroam"
+          '';
+        };
+      };
+    };
   };
 }
diff --git a/modules/network/syncthing.nix b/modules/network/syncthing.nix
index 73d8cf3..ae1f5af 100644
--- a/modules/network/syncthing.nix
+++ b/modules/network/syncthing.nix
@@ -16,6 +16,7 @@ in {
     services.syncthing = {
       enable = true;
       user = "horseman";
+      group = "users";
       dataDir = "/home/horseman";
       configDir = "/home/horseman/.config/syncthing";
       overrideDevices = true;