diff --git a/user/fish.nix b/user/fish.nix
index 84702d7..07841e2 100644
--- a/user/fish.nix
+++ b/user/fish.nix
@@ -8,7 +8,7 @@ in {
         set -g __accent_color "${accent.color}"
         alias _fish_prompt_accent "_fish_prompt_color '$__accent_color'"
         set_color red
-        if not test -d "$HOME/.password-store/"
+        if not test -d "$PASSWORD_STORE_DIR"
           echo "Password Store not yet setup"
         end
         if not test -f "$HOME/.ssh/id_rsa"
diff --git a/user/home.nix b/user/home.nix
index 53aedfa..f42492d 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -23,6 +23,7 @@ in {
     ./bmenu.nix
     ./fzf.nix
     ./ranger
+    ./pass.nix
     inputs.hyprland.homeManagerModules.default
   ] ++ lib.optional (desktop == "sway") ./sway.nix;
 
@@ -56,15 +57,11 @@ in {
     ripgrep
     translate-shell
 
-    (xfce.thunar.override { thunarPlugins = with pkgs.xfce; [
-      thunar-volman
-      thunar-archive-plugin
-    ];})
+    (xfce.thunar.override {
+      thunarPlugins = with pkgs.xfce; [ thunar-volman thunar-archive-plugin ];
+    })
     mate.engrampa
     # gnome.nautilus
-    pass
-    wpass
-    _gpg-unlock
 
     ## games
     # lutris-unwrapped
diff --git a/user/pass.nix b/user/pass.nix
new file mode 100644
index 0000000..88d9709
--- /dev/null
+++ b/user/pass.nix
@@ -0,0 +1,14 @@
+{ config, pkgs, lib, inputs, ... }: {
+  config = {
+    programs.password-store.enable = true;
+    services = {
+      pass-secret-service.enable = true;
+      password-store-sync.enable = true;
+    };
+    home.packages = with pkgs; [
+      pass
+      wpass
+      _gpg-unlock
+    ];
+  };
+}