diff --git a/machines/oldtown/default.nix b/machines/oldtown/default.nix
index 543f225a..a689a861 100644
--- a/machines/oldtown/default.nix
+++ b/machines/oldtown/default.nix
@@ -14,14 +14,7 @@
     efi.canTouchEfiVariables = true;
   };
 
-  networking = {
-    hostName = "oldtown";
-    wireless.enable = true;
-    interfaces = {
-      enp0s31f6.useDHCP = true;
-      wlp2s0.useDHCP = true;
-    };
-  };
+  networking.hostName = "oldtown";
 
   time.timeZone = "Europe/Brussels";
 
diff --git a/machines/pentos/default.nix b/machines/pentos/default.nix
index 1d4b4f6c..3d36547c 100644
--- a/machines/pentos/default.nix
+++ b/machines/pentos/default.nix
@@ -14,14 +14,7 @@
     efi.canTouchEfiVariables = true;
   };
 
-  networking = {
-    hostName = "pentos";
-    wireless.enable = true;
-    interfaces = {
-      enp0s31f6.useDHCP = true;
-      wlp0s20f3.useDHCP = true;
-    };
-  };
+  networking.hostName = "pentos";
 
   time.timeZone = "Europe/Brussels";
 
diff --git a/profiles/graphical/default.nix b/profiles/graphical/default.nix
index 40afcf30..f985b727 100644
--- a/profiles/graphical/default.nix
+++ b/profiles/graphical/default.nix
@@ -40,9 +40,15 @@
     ];
   };
 
+  networking.networkmanager = {
+    enable = true;
+    packages = [ pkgs.networkmanager-vpnc ];
+    wifi.macAddress = "random";
+  };
+
   virtualisation.docker.enable = true;
 
-  users.users.charlotte.extraGroups = [ "docker" "video" "input" ];
+  users.users.charlotte.extraGroups = [ "docker" "video" "input" "networkmanager" ];
 
   environment.systemPackages = with pkgs; [ eid-mw ];
 
@@ -60,6 +66,7 @@
         libreoffice
         moreutils
         mpv
+        networkmanagerapplet
         okular
         pavucontrol
         (