diff --git a/hosts/home.nix b/hosts/home.nix
index bd4875b..597902c 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -100,7 +100,7 @@
       waybar           # Bar
       #
       # Desktop
-      #blueman          # Bluetooth
+      blueman          # Bluetooth
       #deluge           # Torrents
       #discord          # Chat
       ffmpeg           # Video Support (dslr)
diff --git a/hosts/q920/default.nix b/hosts/q920/default.nix
index 4dc5d51..b90a28b 100644
--- a/hosts/q920/default.nix
+++ b/hosts/q920/default.nix
@@ -53,7 +53,7 @@
   programs = {                              # No xbacklight, this is the alterantive
 #    dconf.enable = true;
 #    light.enable = true;
-    #ssh.agent.enable = true
+    ssh.startAgent = false;
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
@@ -65,8 +65,12 @@
 #    tlp.enable = true;                      # TLP and auto-cpufreq for power management
     #logind.lidSwitch = "ignore";            # Laptop does not go to sleep when lid is closed
     auto-cpufreq.enable = true;
-    #blueman.enable = true;
+    blueman.enable = true;
     pcscd.enable = true;
+    udev.packages = [ 
+        pkgs.nitrokey-udev-rules
+        yubikey-personalization
+    ];
     printing = {                            # Printing and drivers for TS5300
       enable = true;
       drivers = [ pkgs.gutenprint ];
diff --git a/hosts/q920/home.nix b/hosts/q920/home.nix
index 41b392d..8588812 100644
--- a/hosts/q920/home.nix
+++ b/hosts/q920/home.nix
@@ -37,8 +37,14 @@
     alacritty.settings.font.size = 11;
   };
 
+  environment.shellInit = ''
+    export GPG_TTY="$(tty)"
+    gpg-connect-agent /bye
+    export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
+  '';
+
   services = {                            # Applets
-    #blueman-applet.enable = true;         # Bluetooth
+    blueman-applet.enable = true;         # Bluetooth
     network-manager-applet.enable = true; # Network
 #   cbatticon = {
 #     enable = true;