diff --git a/modules/binds.nix b/modules/binds.nix deleted file mode 100644 index 9c7d4ad..0000000 --- a/modules/binds.nix +++ /dev/null @@ -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; -} diff --git a/modules/default.nix b/modules/default.nix index 6775c55..d55b54a 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -14,7 +14,6 @@ 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 e861c12..b522127 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -44,10 +44,5 @@ 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 c45eb99..36c9993 100644 --- a/modules/system/base.nix +++ b/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"; diff --git a/modules/system/tailscale.nix b/modules/system/tailscale.nix index 732a9bb..4bded31 100644 --- a/modules/system/tailscale.nix +++ b/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; diff --git a/res/config.lua b/res/config.lua index 3e91e28..5d205d7 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) - end - if prev_line:match('^%s*/%*%*%s*$') then - return vim.fn.indent(vim.v.lnum - 1) + 1 - end + 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 - 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({ - focusable = false, - virtual_text = false, - underline = true, - signs = true, - update_in_insert = true -}) +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 } +) capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)