diff --git a/nixos/arm-incompatible.nix b/nixos/arm-incompatible.nix
index 999d0ea7..54d86da3 100644
--- a/nixos/arm-incompatible.nix
+++ b/nixos/arm-incompatible.nix
@@ -1,10 +1,13 @@
 { pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    spotify
+    discord
     google-chrome
+    keybase-gui
     pommed_light
-    tor-browser-bundle-bin
+    slack
     spicetify-cli
+    spotify
+    tor-browser-bundle-bin
   ];
 }
diff --git a/nixos/desktop.nix b/nixos/desktop.nix
index 3db9adce..b1a6ac50 100644
--- a/nixos/desktop.nix
+++ b/nixos/desktop.nix
@@ -53,18 +53,15 @@
     blueman
     clipit
     dfeet
-    discord
     dolphin
     element-desktop
     emacs
+
     feh
     firefox
-    gitter
     gnome.cheese
     gnome.gpaste
-    google-chrome
     hexchat
-    keybase-gui
     kitty
     kleopatra
     libnotify
@@ -84,8 +81,6 @@
     rofi-systemd
     simplescreenrecorder
     skippy-xd
-    slack
-    spotify
     synergy
     transmission-gtk
     vscode
diff --git a/nixos/machines/biskcomp.nix b/nixos/machines/biskcomp.nix
index 9850bd4f..9fa55295 100644
--- a/nixos/machines/biskcomp.nix
+++ b/nixos/machines/biskcomp.nix
@@ -3,9 +3,8 @@
     ../internet-computer.nix
     ../raspberry-pi.nix
     ../base.nix
-    ../desktop.nix
-    ../xmonad.nix
-    ../code.nix
+    # ../desktop.nix
+    # ../xmonad.nix
   ];
 
   services.xrdp.enable = true;
diff --git a/nixos/nixpkgs b/nixos/nixpkgs
index f2406198..4a729ce4 160000
--- a/nixos/nixpkgs
+++ b/nixos/nixpkgs
@@ -1 +1 @@
-Subproject commit f2406198ea0e4e37d4380d0e20336c575b8f8ef9
+Subproject commit 4a729ce4b1fe5ec4fffc71c67c96aa5184ebb462
diff --git a/nixos/raspberry-pi.nix b/nixos/raspberry-pi.nix
index f5c945c1..c4d9adff 100644
--- a/nixos/raspberry-pi.nix
+++ b/nixos/raspberry-pi.nix
@@ -27,7 +27,7 @@
 
   hardware.enableRedistributableFirmware = true;
 
-  networking.useDHCP = true;
+  # networking.useDHCP = true;
   networking.interfaces.eth0.useDHCP = true;
   networking.interfaces.wlan0.useDHCP = true;
 
@@ -51,7 +51,7 @@
   };
 
   nix = {
-    autoOptimiseStore = true;
+    auto-optimise-store = true;
     gc = {
       automatic = true;
       dates = "weekly";