diff --git a/flake.lock b/flake.lock
index 5ef373b..aa4c5fa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -413,11 +413,11 @@
     },
     "nixunstable": {
       "locked": {
-        "lastModified": 1717786204,
-        "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
+        "lastModified": 1720957393,
+        "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
+        "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
         "type": "github"
       },
       "original": {
diff --git a/home/home.nix b/home/home.nix
index f35e327..22b6a45 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -24,10 +24,10 @@ in
 	programs.tmux = {
 		enable = true;
 		keyMode = "vi";
-		shell = "${pkgs.xonsh}/bin/xonsh";
+		shell = "${pkgs.myxonsh}/bin/xonsh";
 		terminal = "xterm-256color";
 		customPaneNavigationAndResize = true;
-			#"set-option -g default-command ${pkgs.xonsh}/bin/xonsh"
+			#"set-option -g default-command ${pkgs.myxonsh}/bin/xonsh"
 		extraConfig = (lib.strings.concatStringsSep "\n" [
 			"bind P paste-buffer"
 		]);
diff --git a/home/modules/xonsh.nix b/home/modules/xonsh.nix
index 348612c..2b82c53 100644
--- a/home/modules/xonsh.nix
+++ b/home/modules/xonsh.nix
@@ -81,7 +81,7 @@ in with lib; {
 
 	in mkIf cfg.enable {
 
-		home.packages = [ pkgs.xonsh ];
+		home.packages = [ pkgs.myxonsh ];
 
 		home.file.".xonshrc".text = ''
 ${cfg.configHeader}
diff --git a/hosts/hosea/default.nix b/hosts/hosea/default.nix
index 51236c9..1ed4a13 100644
--- a/hosts/hosea/default.nix
+++ b/hosts/hosea/default.nix
@@ -121,7 +121,6 @@ in
 		gregpy
 		shellcheck
 		unzip
-		xonsh
 		xorriso
 		vagrant
 		wget
diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix
index 569b607..cd562f1 100644
--- a/hosts/jeremiah/default.nix
+++ b/hosts/jeremiah/default.nix
@@ -65,7 +65,6 @@
 		gregpy
 		shellcheck
 		unzip
-		xonsh
 		xorriso
 		vagrant
 		wget
diff --git a/hosts/myself/container-runner.nix b/hosts/myself/container-runner.nix
index 2656eff..f272df1 100644
--- a/hosts/myself/container-runner.nix
+++ b/hosts/myself/container-runner.nix
@@ -38,7 +38,6 @@ lib.attrsets.recursiveUpdate {
 		py
 		shellcheck
 		unzip
-		xonsh
 		xorriso
 		vagrant
 		wget
diff --git a/hosts/myself/default.nix b/hosts/myself/default.nix
index c9b5bc7..b012ab1 100644
--- a/hosts/myself/default.nix
+++ b/hosts/myself/default.nix
@@ -15,7 +15,6 @@
 		tmux
 		tree
 		vim
-		xonsh
 		xorriso
 	];
 
diff --git a/hosts/myself/git.nix b/hosts/myself/git.nix
index c6d6901..1207e1e 100644
--- a/hosts/myself/git.nix
+++ b/hosts/myself/git.nix
@@ -142,7 +142,6 @@ in  {
 		qemu_kvm
 		shellcheck
 		unzip
-		xonsh
 		xorriso
 		vagrant
 		wget
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index bc4610f..3fa92fe 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -44,7 +44,10 @@
 	};
 
 	programs = {
-		xonsh.enable = true;
+		xonsh = {
+			enable = true;
+			package = pkgs.myxonsh;
+		};
 	};
 
 	# Enable the OpenSSH daemon for remote control
diff --git a/overlays/default.nix b/overlays/default.nix
index 74258a4..d8f7454 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -83,7 +83,7 @@ in rec {
 	};
 	pipenv-ivr = prev.callPackage ./pipenv.nix { };
 
-	xonsh = (prev.xonsh.override {
+	myxonsh = (prev.xonsh-unwrapped.passthru.wrapper.override {
 		extraPackages = (ps: with ps; [
 			xonsh-apipenv
 			xonsh-direnv