modules/binds.nix

@@ -1,9 +0,0 @@
-{ config, lib, ...}: {
-  imports = [ ./options.nix ];
-  fileSystems = lib.mapAttrs (dest: key: {
-    depends = [ "/persist" ];
-    device = "/persist/binds/${key}";
-    fsType = "none";
-    options = [ "bind" ];
-  }) config.me.binds;
-}

modules/default.nix

@@ -14,7 +14,6 @@ let
     }) paths
   );
 in {
-  binds = ./binds.nix;
   options = ./options.nix;
   services = mkAttrsFromPaths [
     ./services/banksia.nix

modules/options.nix

@@ -44,10 +44,5 @@ in {
       type = types.bool;
       default = false;
     };
-
-    binds = lib.mkOption {
-      type = with lib.types; attrsOf str;
-      default = {};
-    };
   };
 }

modules/system/base.nix

@@ -1,5 +1,5 @@
 { config, inputs, modules, ... }: {
-  imports = [ modules.binds modules.options ];
+  imports = [ modules.options ];
 
   environment.etc = {
     "machine-id".source = "/persist/machine-id";

modules/system/tailscale.nix

@@ -1,6 +1,5 @@
 { 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;

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 line = vim.fn.getline(vim.v.lnum)
-    local prev_line = vim.fn.getline(vim.v.lnum - 1)
+  local prev_line = vim.fn.getline(vim.v.lnum - 1)
-    if line:match('^%s*[%*/]%s*') then
+  if line:match('^%s*[%*/]%s*') then
-        if prev_line:match('^%s*%*%s*') then
+    if prev_line:match('^%s*%*%s*') then
-            return vim.fn.indent(vim.v.lnum - 1)
+      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,13 +157,18 @@ vim.api.nvim_create_autocmd("LspAttach", {
     end
 })
 
-vim.diagnostic.config({
+vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
-    focusable = false,
+    vim.lsp.diagnostic.on_publish_diagnostics, {
-    virtual_text = false,
+        focusable = false,
-    underline = true,
+        virtual_text = false,
-    signs = true,
+        underline = true,
-    update_in_insert = true
+        signs = true,
-})
+        update_in_insert = true
+    }
+)
+vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
+    vim.lsp.handlers.signature_help, { focusable = false }
+)
 
 capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)