diff --git a/home-manager/sajenim/features/desktop/xinitrc b/home-manager/sajenim/features/desktop/xinitrc
index 421b20f..31f9717 100644
--- a/home-manager/sajenim/features/desktop/xinitrc
+++ b/home-manager/sajenim/features/desktop/xinitrc
@@ -15,5 +15,8 @@ dunst &
 # Enable our compositor
 picom -b
 
+# Fix for pinentry bug on NixOS
+gpgconf --reload gpg-agent
+
 # Launch our window manager
 exec xmonad
diff --git a/nixos/common/optional/yubikey.nix b/nixos/common/optional/yubikey.nix
index 9c86ebe..9078daf 100644
--- a/nixos/common/optional/yubikey.nix
+++ b/nixos/common/optional/yubikey.nix
@@ -4,15 +4,16 @@
     age-plugin-yubikey
     # Setup dm-crypt managed device-mapper mappings.
     cryptsetup
-    # Configure your YubiKey via the command line
+    # Configure our YubiKey via the command line
     yubikey-manager
+    # Required for jetbrains password store
+    keepass
   ];
 
   # Manage secret (private) keys.
   programs.gnupg.agent = {
     enable = true;
-    # Fix: invalid time when using keytocard
-    pinentryPackage = pkgs.pinentry-curses;
+    pinentryPackage = pkgs.pinentry-gtk2;
   };
 
   # Use our yubikey as a user login or for sudo access
@@ -21,6 +22,12 @@
     sudo.u2fAuth = true;
   };
 
+  # Configure services
+  services = {
+    # Access smart cards using SCard API
+    pcscd.enable = true;
+  };
+
   # Enable udev rules for gnupg smart cards
   hardware.gpgSmartcards.enable = true;
 }
diff --git a/nixos/fuchsia/configuration.nix b/nixos/fuchsia/configuration.nix
index 59babac..3a395d5 100644
--- a/nixos/fuchsia/configuration.nix
+++ b/nixos/fuchsia/configuration.nix
@@ -33,12 +33,6 @@
     adb.enable = true;
   };
 
-  # Configure services
-  services = {
-    # Access smart cards using SCard API
-    pcscd.enable = true;
-  };
-
   # Manage linux containers
   virtualisation.docker = {
     enable = true;