From 0edeac9f4c06b2dcf20a2338d81dc8ec55643946 Mon Sep 17 00:00:00 2001
From: Cilly Leang <mini@cilly.moe>
Date: Sat, 30 May 2026 19:38:31 +1000
Subject: [PATCH 1/2] user/neovim: remove lsp.with

---
 res/config.lua | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/res/config.lua b/res/config.lua
index 5d205d7..3e91e28 100644
--- a/res/config.lua
+++ b/res/config.lua
@@ -108,18 +108,18 @@ require('lualine').setup {
 -- many thanks to @kristijanhusak
 -- https://github.com/nvim-treesitter/nvim-treesitter/issues/1167#issuecomment-920824125
 function _G.javascript_indent()
-  local line = vim.fn.getline(vim.v.lnum)
-  local prev_line = vim.fn.getline(vim.v.lnum - 1)
-  if line:match('^%s*[%*/]%s*') then
-    if prev_line:match('^%s*%*%s*') then
-      return vim.fn.indent(vim.v.lnum - 1)
+    local line = vim.fn.getline(vim.v.lnum)
+    local prev_line = vim.fn.getline(vim.v.lnum - 1)
+    if line:match('^%s*[%*/]%s*') then
+        if prev_line:match('^%s*%*%s*') then
+            return vim.fn.indent(vim.v.lnum - 1)
+        end
+        if prev_line:match('^%s*/%*%*%s*$') then
+            return vim.fn.indent(vim.v.lnum - 1) + 1
+        end
     end
-    if prev_line:match('^%s*/%*%*%s*$') then
-      return vim.fn.indent(vim.v.lnum - 1) + 1
-    end
-  end
 
-  return vim.fn['GetJavascriptIndent']()
+    return vim.fn['GetJavascriptIndent']()
 end
 
 vim.cmd('au FileType javascript setlocal indentexpr=v:lua.javascript_indent()')
@@ -157,18 +157,13 @@ vim.api.nvim_create_autocmd("LspAttach", {
     end
 })
 
-vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
-    vim.lsp.diagnostic.on_publish_diagnostics, {
-        focusable = false,
-        virtual_text = false,
-        underline = true,
-        signs = true,
-        update_in_insert = true
-    }
-)
-vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
-    vim.lsp.handlers.signature_help, { focusable = false }
-)
+vim.diagnostic.config({
+    focusable = false,
+    virtual_text = false,
+    underline = true,
+    signs = true,
+    update_in_insert = true
+})
 
 capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
 

From 939d0cc861132ef4f1c6577fcfe4c0ebbf3c7c52 Mon Sep 17 00:00:00 2001
From: Cilly Leang <mini@cilly.moe>
Date: Sat, 30 May 2026 20:37:42 +1000
Subject: [PATCH 2/2] system/tailscale: persist tailscale state

---
 modules/binds.nix            | 9 +++++++++
 modules/default.nix          | 1 +
 modules/options.nix          | 5 +++++
 modules/system/base.nix      | 2 +-
 modules/system/tailscale.nix | 1 +
 5 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 modules/binds.nix

diff --git a/modules/binds.nix b/modules/binds.nix
new file mode 100644
index 0000000..9c7d4ad
--- /dev/null
+++ b/modules/binds.nix
@@ -0,0 +1,9 @@
+{ config, lib, ...}: {
+  imports = [ ./options.nix ];
+  fileSystems = lib.mapAttrs (dest: key: {
+    depends = [ "/persist" ];
+    device = "/persist/binds/${key}";
+    fsType = "none";
+    options = [ "bind" ];
+  }) config.me.binds;
+}
diff --git a/modules/default.nix b/modules/default.nix
index d55b54a..6775c55 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -14,6 +14,7 @@ let
     }) paths
   );
 in {
+  binds = ./binds.nix;
   options = ./options.nix;
   services = mkAttrsFromPaths [
     ./services/banksia.nix
diff --git a/modules/options.nix b/modules/options.nix
index b522127..e861c12 100644
--- a/modules/options.nix
+++ b/modules/options.nix
@@ -44,5 +44,10 @@ in {
       type = types.bool;
       default = false;
     };
+
+    binds = lib.mkOption {
+      type = with lib.types; attrsOf str;
+      default = {};
+    };
   };
 }
diff --git a/modules/system/base.nix b/modules/system/base.nix
index 36c9993..c45eb99 100644
--- a/modules/system/base.nix
+++ b/modules/system/base.nix
@@ -1,5 +1,5 @@
 { config, inputs, modules, ... }: {
-  imports = [ modules.options ];
+  imports = [ modules.binds modules.options ];
 
   environment.etc = {
     "machine-id".source = "/persist/machine-id";
diff --git a/modules/system/tailscale.nix b/modules/system/tailscale.nix
index 4bded31..732a9bb 100644
--- a/modules/system/tailscale.nix
+++ b/modules/system/tailscale.nix
@@ -1,5 +1,6 @@
 { config, ... }: {
   age.secrets.tailscale_auth.file = ../../secrets/tailscale_auth.age;
+  me.binds."/var/lib/tailscale" = "tailscale";
   services.tailscale = {
     enable = true;
     authKeyFile = config.age.secrets.tailscale_auth.path;