From 9a87dc63c3f2cdd80c5918ff61864471e6186cc3 Mon Sep 17 00:00:00 2001
From: Cilly Leang <mini@cilly.moe>
Date: Fri, 5 Jun 2026 00:12:18 +1000
Subject: [PATCH 1/6] rin/packages: move prism back to shared gui

---
 users/rin/packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

From 8ca9e393ea1b9d89d49d44d8c2af4bfd4b5aaac0 Mon Sep 17 00:00:00 2001
From: Cilly Leang <mini@cilly.moe>
Date: Fri, 5 Jun 2026 00:16:15 +1000
Subject: [PATCH 2/6] system/input: swap esc using keyd

---
 modules/system/input.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/system/input.nix b/modules/system/input.nix
index 2ef1eab..44da34b 100644
--- a/modules/system/input.nix
+++ b/modules/system/input.nix
@@ -6,7 +6,18 @@
         "-arinterval 15"
       ];
     };
-    xkb.options = "caps:escape";
   };
-  console.useXkbConfig = true;
+  services.keyd = {
+    enable = true;
+    keyboards = {
+      default = {
+        ids = [ "*" ];
+        settings = {
+          main = {
+            capslock = "overload(control, esc)";
+          };
+        };
+      };
+    };
+  };
 }

From 9a6a29831b751dd2a6bb15bf26e6174ebc5ffe8b Mon Sep 17 00:00:00 2001
From: Cilly Leang <mini@cilly.moe>
Date: Fri, 5 Jun 2026 00:18:29 +1000
Subject: [PATCH 3/6] system/security: reenable doas persist

---
 modules/system/security.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
         }
       ];
     };

From 8a85e25d720376b4e8dc4bcdfcbc39d549ce008e Mon Sep 17 00:00:00 2001
From: Cilly Leang <mini@cilly.moe>
Date: Fri, 5 Jun 2026 00:20:29 +1000
Subject: [PATCH 4/6] system/input: don't overload capslock

input delay :p
---
 modules/system/input.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/input.nix b/modules/system/input.nix
index 44da34b..67b1a96 100644
--- a/modules/system/input.nix
+++ b/modules/system/input.nix
@@ -14,7 +14,7 @@
         ids = [ "*" ];
         settings = {
           main = {
-            capslock = "overload(control, esc)";
+            capslock = "esc";
           };
         };
       };

From ea17ef30c609d67155a61579a27fac460112feaa Mon Sep 17 00:00:00 2001
From: Cilly Leang <mini@cilly.moe>
Date: Fri, 5 Jun 2026 00:22:49 +1000
Subject: [PATCH 5/6] system/input: map esc to capslock

---
 modules/system/input.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/input.nix b/modules/system/input.nix
index 67b1a96..a0bf2ff 100644
--- a/modules/system/input.nix
+++ b/modules/system/input.nix
@@ -15,6 +15,7 @@
         settings = {
           main = {
             capslock = "esc";
+            esc = "capslock";
           };
         };
       };

From 75f9cc9d2bdd32fbcb1e28b7a300d61fc04da2b3 Mon Sep 17 00:00:00 2001
From: Cilly Leang <mini@cilly.moe>
Date: Wed, 10 Jun 2026 15:05:05 +1000
Subject: [PATCH 6/6] system/tailscale: open port 123 on headless

---
 modules/system/tailscale.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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;