diff --git a/modules/system/input.nix b/modules/system/input.nix
index 2ef1eab..a0bf2ff 100644
--- a/modules/system/input.nix
+++ b/modules/system/input.nix
@@ -6,7 +6,19 @@
         "-arinterval 15"
       ];
     };
-    xkb.options = "caps:escape";
   };
-  console.useXkbConfig = true;
+  services.keyd = {
+    enable = true;
+    keyboards = {
+      default = {
+        ids = [ "*" ];
+        settings = {
+          main = {
+            capslock = "esc";
+            esc = "capslock";
+          };
+        };
+      };
+    };
+  };
 }
diff --git a/modules/system/security.nix b/modules/system/security.nix
index 3b4e8a7..f1f087b 100644
--- a/modules/system/security.nix
+++ b/modules/system/security.nix
@@ -49,7 +49,7 @@
         {
           groups = [ "wheel" ];
           keepEnv = true;
-          persist = config.me.environment != "laptop";
+          persist = true;
         }
       ];
     };
diff --git a/modules/system/tailscale.nix b/modules/system/tailscale.nix
index 02bce52..e7e6e0c 100644
--- a/modules/system/tailscale.nix
+++ b/modules/system/tailscale.nix
@@ -1,7 +1,9 @@
-{ config, ... }: {
+{ config, lib, ... }: {
   age.secrets.tailscale_auth.file = ../../secrets/tailscale_auth.age;
   me.binds."/var/lib/tailscale" = "tailscale";
   networking.firewall.trustedInterfaces = [ "tailscale0" ];
+  networking.firewall.allowedUdpPorts = lib.mkIf config.me.environment == "headless" [ 123 ];
+
   services.tailscale = {
     enable = true;
     authKeyFile = config.age.secrets.tailscale_auth.path;
diff --git a/users/rin/packages.nix b/users/rin/packages.nix
index 0916865..afc711b 100644
--- a/users/rin/packages.nix
+++ b/users/rin/packages.nix
@@ -25,12 +25,6 @@ in {
     krita
     lutris
     mangohud
-    (prismlauncher.override {
-      jdks = [
-        jdk21
-        temurin-bin-25
-      ];
-    })
     inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin
     qmk
     tetrio-desktop
@@ -54,6 +48,12 @@ in {
     me.psensor
     obsidian
     pavucontrol
+    (prismlauncher.override {
+      jdks = [
+        jdk21
+        temurin-bin-25
+      ];
+    })
     qbittorrent
     rivalcfg
     screenkey