diff --git a/hosts/home.nix b/hosts/home.nix
index eb49176..227fd73 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -44,10 +44,11 @@
       gnupatch
       gnulib
       yubioath-flutter
+      nitrokey-app
 
       tailscale
       wireguard-tools
-      
+
       # Video/Audio
       #feh               # Image Viewer
       mpv               # Media Player
@@ -163,6 +164,8 @@
     home-manager.enable = true;
   };
 
+  services.mpris-proxy.enable = true;  # Headset Button proxy
+
   gtk = {                                     # Theming
     enable = true;
     theme = {
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index 7310bb0..9b4635b 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -85,6 +85,7 @@
         userServices = true;
       };
     };
+    tailscale.enable = true;
 
   };
 
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 25cc48c..ad7f755 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -33,9 +33,7 @@
       element-desktop
       intel-gpu-tools
       pulsemixer
-      #yubioath-desktop
-      nitrokey-app
-
+      
       # Display
       light                              # xorg.xbacklight not supported. Other option is just use xrandr.