diff options
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/treesitter.lua | 6 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/diagnostic.lua | 24 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/keymaps.lua | 38 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/lsp/capabilities.lua | 48 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/options.lua | 6 |
5 files changed, 52 insertions, 70 deletions
diff --git a/nvim/.config/nvim/lua/plugins/treesitter.lua b/nvim/.config/nvim/lua/plugins/treesitter.lua index 27bc65c..0d576c4 100644 --- a/nvim/.config/nvim/lua/plugins/treesitter.lua +++ b/nvim/.config/nvim/lua/plugins/treesitter.lua @@ -104,10 +104,4 @@ local M = { }, } -function M:init() - vim.opt.foldmethod = "expr" - vim.opt.foldexpr = "nvim_treesitter#foldexpr()" - vim.opt.foldenable = false -end - return M diff --git a/nvim/.config/nvim/lua/tobyvin/diagnostic.lua b/nvim/.config/nvim/lua/tobyvin/diagnostic.lua index b81d80d..1aeed00 100644 --- a/nvim/.config/nvim/lua/tobyvin/diagnostic.lua +++ b/nvim/.config/nvim/lua/tobyvin/diagnostic.lua @@ -1,19 +1,21 @@ vim.diagnostic.config({ + underline = true, virtual_text = { source = "if_many", }, - signs = true, - underline = true, - update_in_insert = true, - severity_sort = true, + signs = { + text = { + [vim.diagnostic.severity.ERROR] = " ", + [vim.diagnostic.severity.WARN] = " ", + [vim.diagnostic.severity.INFO] = " ", + [vim.diagnostic.severity.HINT] = " ", + }, + }, float = { - source = "always", - border = "single", scope = "cursor", + source = true, + border = "single", }, + update_in_insert = true, + severity_sort = true, }) - -vim.fn.sign_define("DiagnosticSignError", { text = " ", texthl = "DiagnosticSignError" }) -vim.fn.sign_define("DiagnosticSignWarn", { text = " ", texthl = "DiagnosticSignWarn" }) -vim.fn.sign_define("DiagnosticSignInfo", { text = " ", texthl = "DiagnosticSignInfo" }) -vim.fn.sign_define("DiagnosticSignHint", { text = " ", texthl = "DiagnosticSignHint" }) diff --git a/nvim/.config/nvim/lua/tobyvin/keymaps.lua b/nvim/.config/nvim/lua/tobyvin/keymaps.lua index 60e7808..a15b0da 100644 --- a/nvim/.config/nvim/lua/tobyvin/keymaps.lua +++ b/nvim/.config/nvim/lua/tobyvin/keymaps.lua @@ -1,25 +1,17 @@ -vim.keymap.set("n", "]]", "<CMD>cnext<CR>", { desc = "go to next error" }) -vim.keymap.set("n", "[[", "<CMD>cprev<CR>", { desc = "go to previous error" }) -vim.keymap.set("n", "]b", "<CMD>bnext<CR>", { desc = "go to next buffer in the buffer list" }) -vim.keymap.set("n", "[b", "<CMD>bprev<CR>", { desc = "go to previous buffer in the buffer list" }) -vim.keymap.set("n", "]g", vim.diagnostic.goto_next, { desc = "add buffer diagnostics to loclist" }) -vim.keymap.set("n", "[g", vim.diagnostic.goto_prev, { desc = "add buffer diagnostics to loclist" }) +vim.keymap.set("n", "]q", "<cmd>cnext<cr>", { desc = "cnext" }) +vim.keymap.set("n", "[q", "<cmd>cprev<cr>", { desc = "cprev" }) +vim.keymap.set("n", "]b", "<cmd>bnext<cr>", { desc = "bnext" }) +vim.keymap.set("n", "[b", "<cmd>bprev<cr>", { desc = "bprev" }) -vim.keymap.set("n", "gl", vim.diagnostic.setloclist, { desc = "add buffer diagnostics to loclist" }) -vim.keymap.set("n", "gL", vim.diagnostic.setqflist, { desc = "add all diagnostics to qflist" }) -vim.keymap.set("n", "L", vim.diagnostic.open_float, { desc = "show diagnostics in floating window" }) +vim.keymap.set("n", "gl", vim.diagnostic.setloclist, { desc = "vim.diagnostic.setloclist()" }) +vim.keymap.set("n", "gL", vim.diagnostic.setqflist, { desc = "vim.diagnostic.setqflist()" }) -vim.keymap.set("n", "<a-j>", "<CMD>m +1<CR>", { desc = "move line down" }) -vim.keymap.set("n", "<a-k>", "<CMD>m -2<CR>", { desc = "move line up" }) -vim.keymap.set("v", "<a-k>", "<CMD>m '<-2<CR>gv=gv", { desc = "move selection up" }) -vim.keymap.set("v", "<a-j>", "<CMD>m '>+1<CR>gv=gv", { desc = "move selection down" }) +vim.keymap.set("n", "<a-k>", ":move --<cr>==", { desc = "move --" }) +vim.keymap.set("n", "<a-j>", ":move +<cr>==", { desc = "move +" }) +vim.keymap.set("v", "<a-k>", ":move '<-2<cr>gv=gv", { desc = "move --" }) +vim.keymap.set("v", "<a-j>", ":move '>+1<cr>gv=gv", { desc = "move +" }) -vim.keymap.set("t", "<C-w>", [[<C-\><C-n><C-w>]], { desc = "CTRL-W" }) - -vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]], { desc = "yank lines into selection register" }) -vim.keymap.set({ "n", "v" }, "<leader>Y", [["+Y]], { desc = "yank lines into selection register" }) -vim.keymap.set({ "n", "v" }, "<leader>p", [["+p]], { desc = "put lines from selection register" }) -vim.keymap.set({ "n", "v" }, "<leader>P", [["+P]], { desc = "put lines from selection register" }) +vim.keymap.set("t", "<c-w>", [[<c-\><c-n><c-w>]], { desc = "CTRL-W" }) vim.keymap.set("o", "o", function() local cursor = vim.fn.winsaveview() @@ -35,10 +27,10 @@ vim.keymap.set("i", "<cr>", function() return vim.fn.pumvisible() == 1 and "<C-y>" or "<cr>" end, { expr = true, noremap = true }) -vim.keymap.set({ "i", "s" }, "<Tab>", function() - return vim.snippet.jumpable(1) and "<cmd>lua vim.snippet.jump(1)<cr>" or "<Tab>" +vim.keymap.set({ "i", "s" }, "<tab>", function() + return vim.snippet.jumpable(1) and "<cmd>lua vim.snippet.jump(1)<cr>" or "<tab>" end, { expr = true }) -vim.keymap.set({ "i", "s" }, "<S-Tab>", function() - return vim.snippet.jumpable(-1) and "<cmd>lua vim.snippet.jump(-1)<cr>" or "<S-Tab>" +vim.keymap.set({ "i", "s" }, "<s-tab>", function() + return vim.snippet.jumpable(-1) and "<cmd>lua vim.snippet.jump(-1)<cr>" or "<s-tab>" end, { expr = true }) diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/capabilities.lua b/nvim/.config/nvim/lua/tobyvin/lsp/capabilities.lua index 4bebdb2..c9c2ff7 100644 --- a/nvim/.config/nvim/lua/tobyvin/lsp/capabilities.lua +++ b/nvim/.config/nvim/lua/tobyvin/lsp/capabilities.lua @@ -11,18 +11,12 @@ local M = { vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, { buffer = bufnr, callback = vim.lsp.buf.document_highlight, - desc = "document highlight", + desc = "vim.lsp.buf.document_highlight()", }) - vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, { + vim.api.nvim_create_autocmd("CursorMoved", { buffer = bufnr, callback = vim.lsp.buf.clear_references, - desc = "clear references", - }) - end, - [ms.textDocument_signatureHelp] = function(bufnr) - vim.keymap.set({ "n", "i" }, "<C-s>", vim.lsp.buf.signature_help, { - buffer = bufnr, - desc = "signature help", + desc = "vim.lsp.buf.clear_references()", }) end, [ms.textDocument_documentSymbol] = function(bufnr) @@ -31,49 +25,45 @@ local M = { desc = "definition", }) end, - [ms.textDocument_declaration] = function(bufnr) - vim.keymap.set("n", "gD", vim.lsp.buf.declaration, { - buffer = bufnr, - desc = "declaration", - }) - end, - [ms.textDocument_definition] = function(bufnr) - vim.keymap.set("n", "gd", vim.lsp.buf.definition, { - buffer = bufnr, - desc = "definition", - }) - end, [ms.textDocument_typeDefinition] = function(bufnr) vim.keymap.set("n", "go", vim.lsp.buf.type_definition, { buffer = bufnr, - desc = "type definition", + desc = "vim.lsp.buf.type_definition()", }) end, [ms.textDocument_implementation] = function(bufnr) - vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { + vim.keymap.set("n", "g<c-i>", vim.lsp.buf.implementation, { buffer = bufnr, - desc = "implementation", + desc = "vim.lsp.buf.implementation()", }) end, [ms.textDocument_inlayHint] = function(bufnr) vim.lsp.inlay_hint.enable(true, { bufnr = bufnr }) end, + + -- in preparation for https://github.com/neovim/neovim/pull/28500 + [ms.textDocument_signatureHelp] = function(bufnr) + vim.keymap.set("i", "<c-s>", vim.lsp.buf.signature_help, { + buffer = bufnr, + desc = "vim.lsp.buf.signature_help()", + }) + end, [ms.textDocument_references] = function(bufnr) vim.keymap.set("n", "gr", vim.lsp.buf.references, { buffer = bufnr, - desc = "references", + desc = "vim.lsp.buf.references()", }) end, [ms.textDocument_rename] = function(bufnr) - vim.keymap.set("n", "<leader>lr", vim.lsp.buf.rename, { + vim.keymap.set("n", "crn", vim.lsp.buf.rename, { buffer = bufnr, - desc = "rename", + desc = "vim.lsp.buf.rename()", }) end, [ms.textDocument_codeAction] = function(bufnr) - vim.keymap.set({ "n", "v" }, "<leader>la", vim.lsp.buf.code_action, { + vim.keymap.set({ "n", "v" }, "crr", vim.lsp.buf.code_action, { buffer = bufnr, - desc = "code action", + desc = "vim.lsp.buf.code_action()", }) end, } diff --git a/nvim/.config/nvim/lua/tobyvin/options.lua b/nvim/.config/nvim/lua/tobyvin/options.lua index 522f7db..bbb0e94 100644 --- a/nvim/.config/nvim/lua/tobyvin/options.lua +++ b/nvim/.config/nvim/lua/tobyvin/options.lua @@ -10,7 +10,11 @@ vim.opt.cursorline = true vim.opt.diffopt = { "internal", "filler", "closeoff", "hiddenoff" } vim.opt.equalalways = false vim.opt.expandtab = false -vim.opt.foldmethod = "marker" +vim.opt.fillchars:append("fold: ") +vim.opt.foldenable = false +vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()" +vim.opt.foldmethod = "expr" +vim.opt.foldtext = "" vim.opt.formatoptions = "cqrnj" vim.opt.ignorecase = true vim.opt.inccommand = "split" |