diff --git a/home-manager/jimbo_deck.nix b/home-manager/jimbo_deck.nix
new file mode 100644
index 0000000..0c03da1
--- /dev/null
+++ b/home-manager/jimbo_deck.nix
@@ -0,0 +1,57 @@
+{config, ...}: {
+  imports = [
+    # Common modules
+    ./home.nix
+    ./users/jimbo.nix
+    ./tuiapps/git.nix
+
+    # GUI Apps
+    ./misc/guifiles.nix
+    ./sway/sway.nix
+    ./guiapps/gtk.nix
+    ./guiapps/foot.nix
+    ./guiapps/librewolf.nix
+    ./guiapps/mangohud.nix
+    ./guiapps/mpv.nix
+    ./guiapps/obs.nix
+    ./guiapps/pcmanfm-qt.nix
+    ./guiapps/rofi.nix
+    ./guiapps/swappy.nix
+    ./guiapps/easyeffects.nix
+    ./tuiapps/ncmpcpp.nix
+
+    # Misc apps and tools
+    ./misc/useful.nix
+    ./misc/avtools.nix
+    ./misc/filemanager.nix
+    ./misc/gaming.nix
+    ./misc/xash3d.nix
+    ./misc/emulators.nix
+    ./misc/remotedesktop.nix
+    ./misc/school.nix
+    ./misc/variables.nix
+
+    # Services
+    ./services/gnome-keyring.nix
+    ./services/mako.nix
+    ./services/udiskie.nix
+  ];
+
+  # Rebuild this entire system
+  programs.zsh = {
+    shellAliases = let
+      auth = import ./common/auth.nix;
+    in {
+      sysdate = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#JimDesktop";
+      homedate = "home-manager switch --flake /etc/nixos/.#jimbo@JimDesktop";
+      nixdate = "sysdate; homedate; notify-send 'NixOS switch done.'";
+    };
+  };
+
+  # Symlinks
+  home.file = {
+    "VMs" = {
+      source = config.lib.file.mkOutOfStoreSymlink "/etc/libvirt/VMs";
+    };
+  };
+}
diff --git a/home-manager/jimbo_desktop.nix b/home-manager/jimbo_desktop.nix
index 64bbbfb..62cfc8f 100644
--- a/home-manager/jimbo_desktop.nix
+++ b/home-manager/jimbo_desktop.nix
@@ -43,16 +43,9 @@
     shellAliases = let
       auth = import ./common/auth.nix;
     in {
-      sysdate = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#JimDesktop";
-      homedate = "home-manager switch --flake /etc/nixos/.#jimbo@JimDesktop";
+      sysdate = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#JimDeck";
+      homedate = "home-manager switch --flake /etc/nixos/.#jimbo@JimDeck";
       nixdate = "sysdate; homedate; notify-send 'NixOS switch done.'";
     };
   };
-
-  # Symlinks
-  home.file = {
-    "VMs" = {
-      source = config.lib.file.mkOutOfStoreSymlink "/etc/libvirt/VMs";
-    };
-  };
 }