diff options
Diffstat (limited to '')
| -rw-r--r-- | .vim/lua/conf/diagnostic.lua | 21 | ||||
| -rw-r--r-- | .vim/lua/conf/telescope.lua | 75 | ||||
| -rw-r--r-- | .vim/lua/plugins/_lsp.lua (renamed from .vim/lua/conf/lsp.lua) | 57 | ||||
| -rw-r--r-- | .vim/lua/plugins/_treesitter.lua (renamed from .vim/lua/conf/treesitter.lua) | 2 |
4 files changed, 55 insertions, 100 deletions
diff --git a/.vim/lua/conf/diagnostic.lua b/.vim/lua/conf/diagnostic.lua index 4fd5047..fe80fff 100644 --- a/.vim/lua/conf/diagnostic.lua +++ b/.vim/lua/conf/diagnostic.lua @@ -1,9 +1,12 @@ -vim.g.diagnostic_enable_virtual_text = 1 -vim.g.diagnostic_trimmed_virtual_text = '40' -vim.g.diagnostic_insert_delay = 1 -vim.api.nvim_command('nnoremap <silent> c[ <cmd>PrevDiagnosticCycle<cr>') -vim.api.nvim_command('nnoremap <silent> c] <cmd>NextDiagnosticCycle<cr>') +local g = vim.g +local cmd = vim.api.nvim_command + +g.diagnostic_enable_virtual_text = 1 +g.diagnostic_trimmed_virtual_text = '40' +g.diagnostic_insert_delay = 1 +cmd('nnoremap <silent> c[ <cmd>PrevDiagnosticCycle<cr>') +cmd('nnoremap <silent> c] <cmd>NextDiagnosticCycle<cr>') vim.fn.sign_define("LspDiagnosticsErrorSign", {text="✘", texthl="LspDiagnosticsError"}) @@ -11,7 +14,7 @@ vim.fn.sign_define("LspDiagnosticsWarningSign", {text="‼", texthl="LspDiagnost vim.fn.sign_define("LspDiagnosticsInformationSign", {text="i", texthl="LspDiagnosticsInformation"}) vim.fn.sign_define("LspDiagnosticsHintSign", {text="☛",texthl="LspDiagnosticsHint"}) -vim.api.nvim_command('highlight link LspDiagnosticsError Error') -vim.api.nvim_command('highlight link LspDiagnosticsWarning WarningMsg') -vim.api.nvim_command('highlight link LspDiagnosticsInformation Todo') -vim.api.nvim_command('highlight link LspDiagnosticsHint Question') +cmd('highlight link LspDiagnosticsError Error') +cmd('highlight link LspDiagnosticsWarning WarningMsg') +cmd('highlight link LspDiagnosticsInformation Todo') +cmd('highlight link LspDiagnosticsHint Question') diff --git a/.vim/lua/conf/telescope.lua b/.vim/lua/conf/telescope.lua deleted file mode 100644 index e1145c2..0000000 --- a/.vim/lua/conf/telescope.lua +++ /dev/null @@ -1,75 +0,0 @@ --- config for telescope.nvim -local telescope = require('telescope') -local finders = require('telescope.finders') -local pickers = require('telescope.pickers') -local previewers = require('telescope.previewers') -local make_entry = require('telescope.make_entry') -local sorters = require('telescope.sorters') - -telescope.setup{ - defaults = { - borderchars = {'─', '│', '─', '│', '┌', '┐', '┘', '└'}, - winblend = 3, - layout_strategy = 'flex', - } -} - -vim.api.nvim_set_keymap('n', ';f', "<cmd>lua require'telescope.builtin'.find_files{}<cr>", - {noremap=true, silent=true}) -vim.api.nvim_set_keymap('n', ';g', "<cmd>lua require'telescope.builtin'.live_grep{}<cr>", - {noremap=true, silent=true}) -vim.api.nvim_set_keymap('n', ';r', "<cmd>lua require'telescope.builtin'.lsp_references{}<cr>", - {noremap=true, silent=true}) -vim.api.nvim_set_keymap('n', ';q', "<cmd>lua require'telescope.builtin'.quickfix{}<cr>", - {noremap=true, silent=true}) -vim.api.nvim_set_keymap('n', ';l', "<cmd>lua require'telescope.builtin'.loclist{}<cr>", - {noremap=true, silent=true}) -vim.api.nvim_set_keymap('n', ';b', "<cmd>lua require'telescope.builtin'.buffers{}<cr>", - {noremap=true, silent=true}) --- vim.api.nvim_set_keymap('n', ';h', "<cmd>lua require'conf.telescope'.home{}<cr>", --- {noremap=true, silent=true}) -vim.api.nvim_set_keymap('n', ';w', "<cmd>lua require'conf.telescope'.wiki{}<cr>", - {noremap=true, silent=true}) - -local M = {} -M.fzf = function(opts) - opts = opts or {} - if opts.cwd then - opts.cwd = vim.fn.expand(opts.cwd) - end - local cmd = {'fd', '--type', 'f', '--no-ignore', '--absolute-path'} - if opts.extensions then - for _, ext in ipairs(opts.extensions) do - table.insert(cmd, '--extension') - table.insert(cmd, ext) - end - end - if opts.exclude then - for _, excl in ipairs(opts.exclude) do - table.insert(cmd, '--exclude') - table.insert(cmd, excl) - end - end - pickers.new(opts, { - prompt = opts.prompt or "FZF", - finder = finders.new_oneshot_job(cmd, opts), - previewer = previewers.cat.new(opts), - sorter = sorters.get_fuzzy_file(), - }):find() -end - -M.wiki = function() - return M.fzf { - prompt = 'WIKI', - cwd = '~/wiki', - extensions = {'md'}, - exclude = {'_templates/*'} - } -end --- M.home = function() --- return M.fzf { --- prompt = 'HOME', --- cwd = '~', --- } --- end -return M diff --git a/.vim/lua/conf/lsp.lua b/.vim/lua/plugins/_lsp.lua index 4249de5..9d98aca 100644 --- a/.vim/lua/conf/lsp.lua +++ b/.vim/lua/plugins/_lsp.lua @@ -1,21 +1,33 @@ -- lsp config -local lsp = require 'lspconfig' -local util = require 'lspconfig.util' +local lsp = require('lspconfig') +local util = require('lspconfig.util') +local u = require('utils') -local function my_attach(client) +-- https://github.com/kosayoda/nvim-lightbulb +require('nvim-lightbulb').update_lightbulb { + sign = { + enabled = true, + priority = 10, + }, + float = { + enabled = true, + text = '', + win_opts = {}, + }, +} + +local my_attach = function(client) -- attach completion require 'completion'.on_attach(client) - -- do lsp mappings - vim.fn.nvim_buf_set_keymap(0, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>', - {noremap=true, silent=true}) - vim.fn.nvim_buf_set_keymap(0, 'n', '<c-]>', '<cmd>lua vim.lsp.buf.definition()<cr>', - {noremap=true, silent=true}) - vim.fn.nvim_buf_set_keymap(0, 'n', 'grr', '<cmd>lua vim.lsp.buf.rename()<cr>', - {noremap=true, silent=true}) - vim.fn.nvim_buf_set_keymap(0, 'i', '<c-h>', '<cmd>lua vim.lsp.buf.signature_help()<cr>', - {noremap=true, silent=true}) + -- lsp mappings + u.map('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>') + u.map(0, 'n', '<c-]>', '<cmd>lua vim.lsp.buf.definition()<cr>') + u.map(0, 'n', 'grr', '<cmd>lua vim.lsp.buf.rename()<cr>') + u.map(0, 'i', '<c-h>', '<cmd>lua vim.lsp.buf.signature_help()<cr>') + u.map(0, 'n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<cr>') + u.map(0, 'n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>') -- nnoremap <silent> gD <cmd> lua vim.lsp.buf.declaration()<CR> -- nnoremap <silent> gd <cmd> lua vim.lsp.buf.definition()<CR> @@ -40,12 +52,27 @@ lsp.gopls.setup{ } lsp.sumneko_lua.setup{ - cmd = { 'lua-language-server' }; on_attach = my_attach; + cmd = { 'lua-language-server' }; + settings = { + Lua = { + runtime = { + version = 'LuaJIT', + }, + diagnostics = { + globals = {'vim'}, + }, + workspace = { + library = { + [vim.fn.expand('$VIMRUNTIME/lua')] = true, + [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true, + } + } + } + }, } lsp.rust_analyzer.setup{ - cmd = { 'env', 'CARGO_TARGET_DIR=/tmp', 'rust-analyzer' }, on_attach = my_attach, - + cmd = { 'env', 'CARGO_TARGET_DIR=/tmp', 'rust-analyzer' }, } diff --git a/.vim/lua/conf/treesitter.lua b/.vim/lua/plugins/_treesitter.lua index fed55e1..ef24286 100644 --- a/.vim/lua/conf/treesitter.lua +++ b/.vim/lua/plugins/_treesitter.lua @@ -1,5 +1,5 @@ -require 'nvim-treesitter.configs'.setup { +require('nvim-treesitter.configs').setup { ensure_installed = { "c", "c_sharp", "javascript", "lua", "bash" }, highlight = { enable = false, |