diff --git a/nixos/base.nix b/nixos/base.nix
index 5c14e542..27497d52 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -16,11 +16,8 @@
 
   nixpkgs.overlays = with inputs; [
     nix.overlays.default
-    xmonad.overlay
-    xmonad-contrib.overlay
-    notifications-tray-icon.overlay
     (import ./overlay.nix)
-  ] ++ taffybar.overlays;
+  ];
 
   # Allow all the things
   nixpkgs.config.allowUnfree = true;
@@ -72,7 +69,7 @@
   services.blueman.enable = true;
 
   # Printing
-  # services.printing.enable = true;
+  services.printing.enable = true;
 
   # Keyboard/Keymap
   console.keyMap = "us";
@@ -91,8 +88,6 @@
 
   services.openssh.enable = true;
 
-  services.autorandr.enable = true;
-
   services.locate.enable = true;
 
   virtualisation.docker.enable = true;
@@ -102,32 +97,4 @@
   services.logind.extraConfig = "RuntimeDirectorySize=5G";
 
   services.dbus.packages = [ pkgs.gcr ];
-
-  services.xserver = {
-    exportConfiguration = true;
-    enable = true;
-    layout = "us";
-    desktopManager = {
-      plasma5.enable = true;
-    };
-    windowManager = {
-      session = [
-        {
-          name = "xmonad";
-          start = ''
-            /usr/bin/env imalison-xmonad &
-            waitPID=$!
-          '';
-        }
-      ];
-    };
-    displayManager = {
-      sddm = {
-        enable = true;
-      };
-      sessionCommands = ''
-        systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
-      '';
-    };
-  };
 }
diff --git a/nixos/desktop.nix b/nixos/desktop.nix
new file mode 100644
index 00000000..5546e301
--- /dev/null
+++ b/nixos/desktop.nix
@@ -0,0 +1,41 @@
+{ config, pkgs, options, inputs, ... }:
+{
+  imports = [
+    ./fonts.nix
+  ];
+  nixpkgs.overlays = with inputs; [
+    xmonad.overlay
+    xmonad-contrib.overlay
+    notifications-tray-icon.overlay
+  ] ++ taffybar.overlays;
+
+  services.autorandr.enable = true;
+
+  services.xserver = {
+    exportConfiguration = true;
+    enable = true;
+    layout = "us";
+    desktopManager = {
+      plasma5.enable = true;
+    };
+    windowManager = {
+      session = [
+        {
+          name = "xmonad";
+          start = ''
+            /usr/bin/env imalison-xmonad &
+            waitPID=$!
+          '';
+        }
+      ];
+    };
+    displayManager = {
+      sddm = {
+        enable = true;
+      };
+      sessionCommands = ''
+        systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
+      '';
+    };
+  };
+}
diff --git a/nixos/machines/jay-lenovo.nix b/nixos/machines/jay-lenovo.nix
index b14f3a6c..5d180c08 100644
--- a/nixos/machines/jay-lenovo.nix
+++ b/nixos/machines/jay-lenovo.nix
@@ -10,6 +10,8 @@
     ../essential-no-arm.nix
     ../essential.nix
     ../code.nix
+    ../essential.nix
+    ../desktop.nix
   ];
 
   hardware.enableRedistributableFirmware = true;
diff --git a/nixos/machines/ryzen-shine.nix b/nixos/machines/ryzen-shine.nix
index d2be198e..cc7abf4c 100644
--- a/nixos/machines/ryzen-shine.nix
+++ b/nixos/machines/ryzen-shine.nix
@@ -6,6 +6,8 @@
     ../full.nix
     ../dfinity.nix
     ../games.nix
+    ../essential.nix
+    ../desktop.nix
   ];
 
   environment.systemPackages = with pkgs; [