diff options
Diffstat (limited to '.config/nvim')
| -rw-r--r-- | .config/nvim/lua/fzf.lua | 2 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp.lua | 28 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins.lua | 27 |
3 files changed, 56 insertions, 1 deletions
diff --git a/.config/nvim/lua/fzf.lua b/.config/nvim/lua/fzf.lua index 3dd5645..21341f1 100644 --- a/.config/nvim/lua/fzf.lua +++ b/.config/nvim/lua/fzf.lua @@ -1,6 +1,6 @@ local fzf = require('fzf-lua') vim.keymap.set('n', '<c-b>', fzf.buffers, {}) -vim.keymap.set('n', '<c-t>', fzf.marks, {}) +vim.keymap.set('n', '<c-m>', fzf.marks, {}) vim.keymap.set('n', '<leader>fb', fzf.lines, {}) vim.keymap.set('n', '<leader>ff', fzf.files, {}) vim.keymap.set('n', '<leader>fg', fzf.live_grep, {}) diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua index 47677bc..9ba3926 100644 --- a/.config/nvim/lua/lsp.lua +++ b/.config/nvim/lua/lsp.lua @@ -188,6 +188,34 @@ if not configs.jails then end lspconfig.jails.setup({}) vim.filetype.add({ extension = { jai = "jai", } }) +-- local lsp = require 'lspconfig' +-- local configs = require 'lspconfig.configs' + +-- if not configs.jai_lsp then +-- configs.jai_lsp = { +-- default_config = { +-- cmd = { 'jails' }, +-- filetypes = { 'jai' }, +-- } +-- } +-- end + +-- lspconfig.jai_lsp.setup({ +-- on_attach = on_attach, +-- capabilities = capabilities, +-- }) + +lspconfig.ols.setup({ + on_attach = on_attach, + capabilities = capabilities, + init_options = { + enable_references = true, + enable_rename = true, + enable_semantic_tokens = true, + enable_checker_only_saved = true, + enable_inlay_hints = true, + } +}) vim.api.nvim_create_autocmd('BufWritePre', { pattern = '*.go', diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 45d7988..f1ce125 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -154,5 +154,32 @@ return require('lazy').setup({ vim.g.lsp_zero_extend_cmp = 0 vim.g.lsp_zero_extend_lspconfig = 0 end, + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = { + keywords = { + FIX = { + icon = " ", -- icon used for the sign, and in search results + color = "error", -- can be a hex color, or a named color (see below) + alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, -- a set of other keywords that all map to this FIX keywords + -- signs = false, -- configure signs for some keywords individually + }, + TODO = { icon = " ", color = "info", alt = { "nocheckin" } }, + HACK = { icon = " ", color = "warning" }, + WARN = { icon = " ", color = "warning", alt = { "WARNING", "XXX" } }, + PERF = { icon = " ", alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" } }, + NOTE = { icon = " ", color = "hint", alt = { "INFO" } }, + TEST = { icon = "⏲ ", color = "test", alt = { "TESTING", "PASSED", "FAILED" } }, + }, + } + }, + + -- movement + 'ggandor/leap.nvim', + { + "chentoast/marks.nvim", + event = "VeryLazy", + opts = { + }, }, }) |
