diff --git a/homes/x86_64-linux/admin@nuc-nixos/default.nix b/homes/x86_64-linux/admin@nuc-nixos/default.nix
index 5a4d489..b2a5c5f 100755
--- a/homes/x86_64-linux/admin@nuc-nixos/default.nix
+++ b/homes/x86_64-linux/admin@nuc-nixos/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 let
   shellAliases = {
     update-boot = "sudo nixos-rebuild boot --max-jobs 10";
@@ -12,4 +12,21 @@ in
   programs = {
     zsh.shellAliases = shellAliases;
   };
+
+  # Configure systemd user service for protonmail-bridge
+  systemd.user.services.protonmail-bridge = {
+    Service = {
+      Environment = [
+        "GNUPGHOME=/home/admin/.gnupg"
+        "PASSWORD_STORE_DIR=/home/admin/.local/password-store"
+      ];
+    };
+  };
+
+  services = {
+    protonmail-bridge = {
+      enable = true;
+      extraPackages = with pkgs; [ pass libsecret ];
+    };
+  };
 }
diff --git a/modules/home/services/pass/default.nix b/modules/home/services/pass/default.nix
index 31bb2bc..60b3cca 100644
--- a/modules/home/services/pass/default.nix
+++ b/modules/home/services/pass/default.nix
@@ -1,10 +1,14 @@
 {
   config,
   lib,
+  pkgs,
   namespace,
   ...
 }:
 {
+  #services.gnome-keyring.enable = false;
+  #home.packages = [ pkgs.gcr ];
+
   services.pass-secret-service = {
     enable = true;
   };
diff --git a/modules/nixos/homeassistant/default.nix b/modules/nixos/homeassistant/default.nix
index b215e1a..0d93709 100755
--- a/modules/nixos/homeassistant/default.nix
+++ b/modules/nixos/homeassistant/default.nix
@@ -18,19 +18,7 @@ in
       chmod -R 750 ${config.services.home-assistant.configDir}
     '';
 
-    # Configure systemd user service for protonmail-bridge
-    systemd.user.services.protonmail-bridge = {
-      environment = {
-        GNUPGHOME = "%h/.gnupg";
-        PASSWORD_STORE_DIR = "%h/.local/password-store";
-      };
-    };
-
     services = {
-      protonmail-bridge = {
-        enable = true;
-        path = with pkgs; [ pass libsecret gnome-keyring ];
-      };
       matter-server = {
         enable = true;
         port = 5580;
diff --git a/modules/nixos/security/common/default.nix b/modules/nixos/security/common/default.nix
index 6c12b0f..083e2ae 100644
--- a/modules/nixos/security/common/default.nix
+++ b/modules/nixos/security/common/default.nix
@@ -44,7 +44,7 @@
 
   services = {
     yubikey-agent.enable = true;
-    passSecretService.enable = true;
+    passSecretService.enable = false;
     pcscd.enable = true;
   };