diff --git a/nix/deployments/nixops.nix b/nix/deployments/nixops.nix
index f32b8ea..b2b2369 100644
--- a/nix/deployments/nixops.nix
+++ b/nix/deployments/nixops.nix
@@ -26,6 +26,9 @@
   server = {
     deployment.targetHost = "192.168.1.65";
     imports = [ ../system/xps11/configuration.nix ];
+    networking.wireless.networks.N904.pskRaw = (
+      (import ../system/framework/keys.nix).wifi.N904.pskRaw
+    );
   };
 
   nas = {
diff --git a/nix/system/common/users.nix b/nix/system/common/users.nix
index 7c21ab6..c6f6014 100644
--- a/nix/system/common/users.nix
+++ b/nix/system/common/users.nix
@@ -9,6 +9,10 @@
     ];
   };
 
+  # run the following command to swap escape and caps-lock keys, like a
+  # civilized person:
+  services.xserver.xkbOptions = "caps:swapescape";
+
   users.extraUsers.haak = {
     shell = pkgs.zsh;
   };
diff --git a/nix/system/framework/configuration.nix b/nix/system/framework/configuration.nix
index 867786f..66962d1 100644
--- a/nix/system/framework/configuration.nix
+++ b/nix/system/framework/configuration.nix
@@ -142,9 +142,6 @@
     desktopManager.gnome.enable = true;
 
     layout = "us";
-    # run the following command to swap escape and caps-lock keys, like a
-    # civilized person:
-    xkbOptions = "caps:swapescape";
   };
 
   services.syncthing = {
diff --git a/nix/system/xps11/configuration.nix b/nix/system/xps11/configuration.nix
index ee23e3f..4c124ee 100644
--- a/nix/system/xps11/configuration.nix
+++ b/nix/system/xps11/configuration.nix
@@ -19,10 +19,10 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   hardware.bluetooth.enable = true;
-  networking.networkmanager.enable = true;
+  # networking.networkmanager.enable = true;
   networking.hostName = "athena"; # Define your hostname.
   # Create entries for /etc/wpa_supplicant.conf by running `wpa_passphrase SSID PASSWORD`
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
 
   # The global useDHCP flag is deprecated, therefore explicitly set to false here.
   # Per-interface useDHCP will be mandatory in the future, so this generated config
@@ -49,21 +49,12 @@
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     cachix
-    # configure local network sharing, launch app on startup, and auto-connect
-    # in the preferences menu
-    mullvad-vpn
     p7zip
-    # Do NOT use qbittorrent unless you have set up interface binding with your
-    # VPN: https://web.archive.org/web/20210426203101/https://mullvad.net/en/help/bittorrent/
-    qbittorrent
     wget
-    zsh
   ];
 
   nixpkgs.config.allowUnfree = true;
 
-  fonts.fonts = with pkgs; [ fira-code ];
-
   # Open ports in the firewall.
   networking.firewall = {
     allowedTCPPorts = [
@@ -147,11 +138,6 @@
     };
   };
 
-  # VPN setup
-  services.mullvad-vpn.enable = true;
-  networking.wireguard.enable = true;
-  networking.firewall.checkReversePath = "loose";
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
@@ -162,10 +148,7 @@
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
   services.xserver.layout = "us";
-  services.xserver.xkbOptions = "caps:swapescape";
 
   services.plex = {
     enable = true;
@@ -174,15 +157,7 @@
   };
 
   # Enable touchpad support.
-  services.xserver.libinput.enable = true;
-
-  # Enable the KDE Desktop Environment.
-  services.xserver = {
-    displayManager.sddm.enable = true;
-    desktopManager.plasma5.enable = true;
-  };
-
-  location.provider = "geoclue2";
+  # services.xserver.libinput.enable = true;
 
   # This value determines the NixOS release with which your system is to be
   # compatible, in order to avoid breaking some software such as database