diff options
Diffstat (limited to '.config/nvim')
| -rw-r--r-- | .config/nvim/init.lua | 2 | ||||
| -rw-r--r-- | .config/nvim/lua/config/bindings.lua | 2 | ||||
| -rw-r--r-- | .config/nvim/lua/config/lazy.lua | 13 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp/perlls.lua | 23 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp/perlnavigator.lua | 16 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/lualine.lua | 5 |
6 files changed, 36 insertions, 25 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index bdfa8bd..742d23c 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -25,4 +25,4 @@ require('lsp.bashls') require('lsp.clangd') require('lsp.gopls') require('lsp.luals') -require('lsp.perlnavigator') +require('lsp.perlls') diff --git a/.config/nvim/lua/config/bindings.lua b/.config/nvim/lua/config/bindings.lua index 5821e5f..73dc669 100644 --- a/.config/nvim/lua/config/bindings.lua +++ b/.config/nvim/lua/config/bindings.lua @@ -69,3 +69,5 @@ vim.keymap.set('n', '<leader>rw', fzf.lsp_definitions, { noremap = true, silent vim.keymap.set('n', '<leader>ri', fzf.lsp_implementations, { noremap = true, silent = true }) vim.keymap.set('n', '<leader>rt', fzf.lsp_typedefs, { noremap = true, silent = true }) vim.keymap.set('n', '<leader>re', fzf.lsp_document_symbols, { noremap = true, silent = true }) +vim.keymap.set('n', '<leader>s', '<Plug>(leap-anywhere)', { noremap = true, silent = true }) +vim.keymap.set('n', '<leader>S', '<Plug>(leap-backward)', { noremap = true, silent = true }) diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua index e61cf4a..2b8d66d 100644 --- a/.config/nvim/lua/config/lazy.lua +++ b/.config/nvim/lua/config/lazy.lua @@ -83,7 +83,7 @@ require('lazy').setup({ default_overlength = 80, grace_length = 1, highlight_to_eol = true, - disable_ft = { 'qf', 'help', 'man', 'checkhealth', 'lazy', 'packer', 'NvimTree', 'Telescope', 'WhichKey', 'text', 'csv', 'lua', 'gosum', '' } + disable_ft = { 'qf', 'help', 'man', 'checkhealth', 'lazy', 'packer', 'NvimTree', 'Telescope', 'WhichKey', 'text', 'csv', 'lua', 'gosum', 'sh', '' } } end }, @@ -97,11 +97,14 @@ require('lazy').setup({ 'ggandor/leap.nvim', dependencies = { 'tpope/vim-repeat' }, config = function() + require('leap').opts.preview_filter = + function (ch0, ch1, ch2) + return not ( + ch1:match('%s') or + ch0:match('%a') and ch1:match('%a') and ch2:match('%a') + ) + end require('leap').setup({}) - vim.keymap.set({'n', 'x', 'o'}, '<leader>s', '<Plug>(leap-forward-to)') - vim.keymap.set({'n', 'x', 'o'}, '<leader>S', '<Plug>(leap-backward-to)') - vim.keymap.set({'n', 'x', 'o'}, '<C-s>', '<Plug>(leap-forward-till)') - vim.keymap.set({'n', 'x', 'o'}, '<C-S-s>', '<Plug>(leap-backward-till)') end }, { diff --git a/.config/nvim/lua/lsp/perlls.lua b/.config/nvim/lua/lsp/perlls.lua new file mode 100644 index 0000000..b995cd2 --- /dev/null +++ b/.config/nvim/lua/lsp/perlls.lua @@ -0,0 +1,23 @@ +vim.lsp.config('perlls', { + cmd = { + 'perl', + '-MPerl::LanguageServer', + '-e', + 'Perl::LanguageServer::run', + '--', + '--port 13603', + '--nostdio 0', + }, + settings = { + perl = { + perlCmd = 'perl', + perlInc = ' ', + fileFilter = { '.pm', '.pl' }, + ignoreDirs = '.git', + }, + }, + filetypes = { 'perl' }, + root_markers = { '.git' }, +}) + +vim.lsp.enable('perlls') diff --git a/.config/nvim/lua/lsp/perlnavigator.lua b/.config/nvim/lua/lsp/perlnavigator.lua deleted file mode 100644 index 1ba0024..0000000 --- a/.config/nvim/lua/lsp/perlnavigator.lua +++ /dev/null @@ -1,16 +0,0 @@ -vim.lsp.config('perlnavigator', { - cmd = {'perlnavigator'}, - filetypes = {'perl'}, - root_markers = {'.git'}, - settings = { - perlnavigator = { - perlPath = 'perl', - enableWarnings = true, - perltidyProfile = '', - perlcriticProfile = '', - perlcriticEnabled = true, - } - } -}) - -vim.lsp.enable('perlnavigator') diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua index b2a92d0..53d22ff 100644 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim/lua/plugins/lualine.lua @@ -7,7 +7,6 @@ return { bg = '#32302f', fg = '#a89984', orange = '#fe8019', - violet = '#a9a1e1', red = '#cc241d', green = '#98971a', yellow = '#d79921', @@ -37,7 +36,7 @@ return { [''] = colors.orange, ic = colors.yellow, R = colors.bright_red, - Rv = colors.violet, + Rv = colors.bright_magenta, cv = colors.red, ce = colors.red, r = colors.cyan, @@ -199,7 +198,7 @@ return { ins_right { 'branch', icon = '', - color = { fg = colors.violet, gui = 'bold' }, + color = { fg = colors.blue, gui = 'bold' }, } ins_right { |