diff --git a/home/default.nix b/home/default.nix
index 158c493..d4ec811 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -37,6 +37,9 @@ in
       };
     })
     (lib.mkIf cfg.enable {
+      # Add gopass if pass is enabled
+      packages = lib.optional config.programs.password-store.enable pkgs.gopass;
+
       nix.settings.use-xdg-base-directories = fromOs [
         "nix"
         "settings"
@@ -113,11 +116,6 @@ in
       home = {
         stateVersion = "22.11";
         # Extra packages
-        packages = [
-          pkgs.gopass
-          pkgs.sshfs
-          pkgs.unstable.gitoxide
-        ];
         # Extra variables
         sessionVariables = {
           CARGO_HOME = "${config.xdg.dataHome}/cargo";
diff --git a/home/options.nix b/home/options.nix
index 4334c16..2f65337 100644
--- a/home/options.nix
+++ b/home/options.nix
@@ -199,6 +199,7 @@ in
                 [ "typos" ] # low false positive rate typo checker
                 [ "gcc" ] # GNU Compiler Collection
                 [ "git-absorb" ] # fixup! but automatic
+                [ "gitoxide" ] # git but RiiR
                 [ "man-pages" ] # gimme the man pages
                 [ "man-pages-posix" ] # I said gimme the man pages!!!
               ];