diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix
index ac4f553..5cf79ca 100644
--- a/modules/home-manager/sway.nix
+++ b/modules/home-manager/sway.nix
@@ -194,7 +194,6 @@ in {
         {command = "${pkgs.keepassxc}/bin/keepassxc";}
         {command = "${pkgs.waybar}/bin/waybar";}
         {command = "${pkgs.foot}/bin/foot -a foot-startup";}
-        {command = "${pkgs.wpa_supplicant_gui}/bin/wpa_gui -t";}
       ];
 
       defaultWorkspace = "main";
diff --git a/modules/nixos/wifi.nix b/modules/nixos/wifi.nix
index f589765..eb8a0fd 100644
--- a/modules/nixos/wifi.nix
+++ b/modules/nixos/wifi.nix
@@ -7,43 +7,12 @@
     sopsFile = ../../secrets/wifi.yaml;
   };
   sops.age.keyFile = /home/max/.config/sops/age/keys.txt;
-  networking.wireless = {
+  networking.networkmanager = {
     enable = true;
-    userControlled.enable = true;
-    environmentFile = config.sops.secrets."wireless.env".path;
-    networks = {
-      "@home_uuid@" = {
-        psk = "@home_psk@";
-        priority = 10;
-      };
-      "@par_uuid@" = {
-        psk = "@par_psk@";
-        priority = 10;
-      };
-      "@luhbots_uuid@" = {
-        psk = "@luhbots_psk@";
-        priority = 5;
-      };
-      eduroam = {
-        auth = ''
-          key_mgmt=WPA-EAP
-          proto=RSN
-          pairwise=CCMP
-          group=CCMP
-          eap=TTLS
-          phase2="auth=MSCHAPV2"
-          anonymous_identity="anonymous@uni-hannover.de"
-          identity="@eduroam_ident@"
-          password="@eduroam_psk@"
-          ca_cert="/etc/ssl/certs/T-TeleSec_GlobalRoot_Class_2.crt"
-        '';
-        priority = 0;
-      };
-    };
+    wifi.backend = "wpa_supplicant";
   };
-  users.extraUsers.max.extraGroups = ["wheel"];
 
   environment.systemPackages = with pkgs; [
-    wpa_supplicant_gui
+    nm-tray
   ];
 }