diff --git a/hosts/common/global/users.nix b/hosts/common/global/users.nix
index de739337..df7961d5 100644
--- a/hosts/common/global/users.nix
+++ b/hosts/common/global/users.nix
@@ -13,7 +13,6 @@ in
         "video"
         "audio"
       ]
-      ++ (lib.optional config.networking.networkmanager.enable "networkmanager")
       ++ (lib.optional config.programs.wireshark.enable "wireshark")
       ++ (lib.optional config.hardware.i2c.enable "i2c")
       ++ (lib.optional config.services.deluge.enable "deluge")
diff --git a/hosts/common/optional/networkmanager.nix b/hosts/common/optional/networkmanager.nix
deleted file mode 100644
index dcd535b9..00000000
--- a/hosts/common/optional/networkmanager.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ persistence, lib, ... }: {
-  networking.networkmanager.enable = true;
-
-  environment.persistence = lib.mkIf persistence {
-    "/persist" = {
-      directories = [
-        "/etc/NetworkManager/system-connections"
-      ];
-    };
-  };
-}
diff --git a/hosts/common/optional/wireless.nix b/hosts/common/optional/wireless.nix
new file mode 100644
index 00000000..5bcd0a16
--- /dev/null
+++ b/hosts/common/optional/wireless.nix
@@ -0,0 +1,19 @@
+{ config, ... }: {
+  sops.secrets.wireless = {
+    sopsFile = ../secrets.yaml;
+    neededForUsers = true;
+  };
+
+  networking.wireless = {
+    enable = true;
+    environmentFile = config.sops.secrets.wireless.path;
+    networks = {
+      "Marcos_2.4Ghz" = {
+        psk = "@PSK_MARCOS@";
+      };
+      "Misterio" = {
+        psk = "@PSK_MISTERIO@";
+      };
+    };
+  };
+}
diff --git a/hosts/common/secrets.yaml b/hosts/common/secrets.yaml
index 90e34155..980573cb 100644
--- a/hosts/common/secrets.yaml
+++ b/hosts/common/secrets.yaml
@@ -1,5 +1,6 @@
 misterio-password: ENC[AES256_GCM,data:bQR9UtCNRl9S/anjqwO8Ssnbx8v+sx1YMKgNeL2lvHQ0JB0vXcyQuUHnvKF0qZU3h8G/zJBJ06oDSwd0xH6wghExC3LQGkqG4uuPxj2JZTbZMgaCYawq2clo45D1p/7UYkm1d+5iHGO1Ag==,iv:SYGY0leQkFniuxiG/V4EsBPF4saSctoQ9Yke9cg5QzA=,tag:5Gzj98eaop9nfSUu0x70hQ==,type:str]
 peerix-key: ENC[AES256_GCM,data:J5jL+70oUpGTyyIPpXUL6wWd4Du6VZkgiNCkOOFDpmmzNKJf4YaSPl0NQJdDD8S/j/gO252LytCvjjViSS3HmKbqJm18prvBX88w5SQvoXsTQQE2pHHpZE0GSfHn6Ok=,iv:i/lntRB+iZFdGNNk1H+0OmZA3HrCLMYTP5lvjW1scNY=,tag:BTKsEyHnSFwiQ7iSME2n3A==,type:str]
+wireless: ENC[AES256_GCM,data:ojYN7RCy9BGs8cK1LJziZ0wijUfQjpZOAukTpDQB7V4g5qM01GKwsTk9sE4NXcsYkNpFjQoMnYxVmn0=,iv:pVfbWoXaAv01Hnp8HEZFp8TMLk/oqzLPYRdZ9+w0GFU=,tag:bPNanuMyEqraQUGGtCV8CQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -42,8 +43,8 @@ sops:
             bkRjMnZZM3hYSzBNN2lJbTVqNWh0SkEKXZUYG+wof+ZzcR8KXp6i4QIuj2uhmkYP
             gU4S0snWYCDHGciLSPXz/BPL6AvfGYdPoSPLdYKmnwFW9ClfCHBrsg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2022-07-14T03:43:38Z"
-    mac: ENC[AES256_GCM,data:yM3ZxpPD65AO3/J7ZocZm3f+Pl1cS0rCgttoNEu7p/IcCruCGLDT3ZB80jZ2ONsBu2ftPaUc32I3a3aEZ4MGYtT66EzjoAzwYXH6pHTpezquvVgifIybCUrWAkcfMd9UgSP73+Fj4mJgqwBtRDtYD3nhBx7O2KpW8l2/aNYNVi0=,iv:5lR4YIG+cjUEpCvwvm+Bf5AjRiYhzwPiv2zGj5CXyA8=,tag:vsUKOpRiECM/FmRa5EH01w==,type:str]
+    lastmodified: "2022-08-06T18:51:28Z"
+    mac: ENC[AES256_GCM,data:lU3PEYlwXbKObraTgOV+yAA0EGslJQXNIl/51Tv3bzCRH5S57CBUZZLecw3k2eXQ27DCa043CRPOAC13e/q6r+zuSRqeY9MXdCfvawT41klS7flIzWLifZJ481y7rEcmt6nSEUpxb6u+jQdiAV4M6vMfREa0rF34l7FC5PXqaUw=,iv:s7hw/KbLVewejcwGi3Ekxazf7PB9uP0oUYKamNs+E5w=,tag:c8b+JKYSm9joN9+WwGaXLg==,type:str]
     pgp:
         - created_at: "2022-08-05T06:10:53Z"
           enc: |-
diff --git a/hosts/pleione/default.nix b/hosts/pleione/default.nix
index f9882794..a192d556 100644
--- a/hosts/pleione/default.nix
+++ b/hosts/pleione/default.nix
@@ -7,8 +7,8 @@
 
     ./hardware-configuration.nix
     ../common/global
+    ../common/optional/wireless.nix
     ../common/optional/misterio-greetd.nix
-    ../common/optional/networkmanager.nix
     ../common/optional/pipewire.nix
     ../common/optional/podman.nix
     ../common/optional/postgres.nix