diff --git a/hosts/python/users/default.nix b/hosts/python/users/default.nix
index 60dbca7..9e22a77 100644
--- a/hosts/python/users/default.nix
+++ b/hosts/python/users/default.nix
@@ -37,6 +37,7 @@
         geary
         qutebrowser
         dunst
+        gh
         ;
       inherit (inputs.hetch.packages.${pkgs.system}) hetch;
     };
diff --git a/overlays/derivations/xonsh/cfg/xonsh/rc.xsh b/overlays/derivations/xonsh/cfg/rc.xsh
similarity index 100%
rename from overlays/derivations/xonsh/cfg/xonsh/rc.xsh
rename to overlays/derivations/xonsh/cfg/rc.xsh
diff --git a/overlays/derivations/xonsh/default.nix b/overlays/derivations/xonsh/default.nix
index 5d1b521..bc0f08f 100644
--- a/overlays/derivations/xonsh/default.nix
+++ b/overlays/derivations/xonsh/default.nix
@@ -13,8 +13,8 @@
           src = fetchFromGitHub {
             owner = "amadaluzia";
             repo = finalAttrs.pname;
-            rev = "8d01b29e0e9b4f7d63ec380ceb1e701302c33ee8";
-            hash = "sha256-jBAJTjH80GJ89u8r/zVWnMNXXi9V9qPw0AVy071a7rg=";
+            rev = "master";
+            hash = "sha256-20egNKlJjJO1wdy1anApz0ADBnaHPUSqhfrsPe3QQIs=";
           };
         });
       };
@@ -47,27 +47,27 @@
             hash = "sha256-CLOvMa3L4XnH53H/k6/1W9URrPakPjbX1T1U43+eSR0=";
           };
         })
-      # (let
-      #   pname = "xontrib-init-ssh-agent";
-      #   version = "1.0.1";
-      # in
-      #   ps.buildPythonPackage {
-      #     inherit pname version;
-      #     pyproject = true;
-      #     build-system = [
-      #       ps.setuptools
-      #       ps.wheel
-      #     ];
-      #     dependencies = [
-      #       ps.xonsh
-      #     ];
-      #     src = fetchFromGitHub {
-      #       owner = "amadaluzia";
-      #       repo = pname;
-      #       rev = "cac9cfec70ec15b0ed4f1c8a18154ea9b4f8fb47";
-      #       hash = "sha256-UkRPdaZFNP8qv7lMwsTUalnre3k2UMfqMzmiTveLiBM=";
-      #     };
-      #   })
+      (let
+        pname = "xontrib-init-ssh-agent";
+        version = "1.0.1";
+      in
+        ps.buildPythonPackage {
+          inherit pname version;
+          pyproject = true;
+          build-system = [
+            ps.setuptools
+            ps.wheel
+          ];
+          dependencies = [
+            ps.custom-xonsh
+          ];
+          src = fetchFromGitHub {
+            owner = "amadaluzia";
+            repo = pname;
+            rev = "cac9cfec70ec15b0ed4f1c8a18154ea9b4f8fb47";
+            hash = "sha256-UkRPdaZFNP8qv7lMwsTUalnre3k2UMfqMzmiTveLiBM=";
+          };
+        })
       (let
         pname = "xonsh-direnv";
         version = "1.6.5";