diff --git a/home/home.nix b/home/home.nix
index 708bd3d..4a4c770 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -20,6 +20,7 @@ in
 
   home.packages = with pkgs; [
     kotatogram-desktop
+    nheko
     docker-compose
     libreoffice
 
diff --git a/home/progs/pass.nix b/home/progs/pass.nix
index 9fc5889..2e36655 100644
--- a/home/progs/pass.nix
+++ b/home/progs/pass.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
   cfg = config.progs.pass;
-  pass_data_dir = "${config.home.sessionVariables.XDG_DATA_HOME}/pass";
+  passDataDir = "${config.xdg.dataHome}/pass";
 in
 {
   options.progs.pass = {
@@ -16,16 +16,16 @@ in
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ pkgs.pass ];
-
-    home.sessionVariables = {
-      PASSWORD_STORE_DIR = "${pass_data_dir}/store";
-      PASSWORD_STORE_EXTENSIONS_DIR = "${pass_data_dir}/extensions";
+    programs.password-store = {
+      enable = true;
+      settings = {
+        PASSWORD_STORE_DIR = "${passDataDir}/store";
+        PASSWORD_STORE_EXTENSIONS_DIR = "${passDataDir}/extensions";
+      };
     };
+    services.pass-secret-service.enable = true;
 
     programs.gpg.enable = true;
-
     services.gpg-agent.enable = true;
   };
 }
-