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