diff --git a/flake.lock b/flake.lock
index 673a8d5..ecfb2ac 100644
--- a/flake.lock
+++ b/flake.lock
@@ -120,6 +120,23 @@
         "type": "github"
       }
     },
+    "home-manager-unstable": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1725180166,
+        "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
+        "type": "tarball",
+        "url": "https://github.com/nix-community/home-manager/archive/master.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/nix-community/home-manager/archive/master.tar.gz"
+      }
+    },
     "jovian-nixos": {
       "inputs": {
         "nix-github-actions": "nix-github-actions",
@@ -332,6 +349,7 @@
         "blender-bin": "blender-bin",
         "hardware": "hardware",
         "home-manager": "home-manager",
+        "home-manager-unstable": "home-manager-unstable",
         "jovian-nixos": "jovian-nixos",
         "nix-minecraft": "nix-minecraft",
         "nixos-mailserver": "nixos-mailserver",
diff --git a/home-manager/jimbo_deck.nix b/home-manager/jimbo_deck.nix
index 3c6afd6..0b4184e 100644
--- a/home-manager/jimbo_deck.nix
+++ b/home-manager/jimbo_deck.nix
@@ -42,8 +42,8 @@
     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.'";
     };
   };
diff --git a/home-manager/jimbo_desktop.nix b/home-manager/jimbo_desktop.nix
index 73e58e5..64bbbfb 100644
--- a/home-manager/jimbo_desktop.nix
+++ b/home-manager/jimbo_desktop.nix
@@ -43,8 +43,8 @@
     shellAliases = let
       auth = import ./common/auth.nix;
     in {
-      sysdate = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#JimDeck";
-      homedate = "home-manager switch --flake /etc/nixos/.#jimbo@JimDeck";
+      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.'";
     };
   };
diff --git a/home-manager/sway/sway.nix b/home-manager/sway/sway.nix
index 16e7cc5..f868a05 100644
--- a/home-manager/sway/sway.nix
+++ b/home-manager/sway/sway.nix
@@ -15,6 +15,7 @@
   # Enable Sway and write some scripts
   wayland.windowManager.sway = {
     enable = true;
+    package = null;
     wrapperFeatures.gtk = true;
     checkConfig = false;
     extraConfig = let