Mercurial > dotfiles

annotate dot_config/nvim/config.lua @ 368:72e8dd5a4ab5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up LSP peek functions
author Zeger Van de Vannet <zegervdv@me.com>
date Tue, 30 Mar 2021 21:36:24 +0200
parents f0a89299e854
children 5ffb0fd7b98d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
1 --
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
2 -- Neovim dotfiles
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
3 --
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
4 --
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
5
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
6 local execute = vim.api.nvim_command
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
7 local fn = vim.fn
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
8
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
9 -- Bootstrap package manager
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
10 local install_path = fn.stdpath('data')..'/site/pack/packer/opt/packer.nvim'
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
11
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
12 if fn.empty(fn.glob(install_path)) > 0 then
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
13 execute('!git clone https://github.com/wbthomason/packer.nvim '..install_path)
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
14 end
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
15
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
16 -- Packer configuration is compiled and only needs to be loaded on changes
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
17 function packer_enable()
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
18 vim.cmd "packadd packer.nvim"
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
19
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
20 require('packer').startup(function()
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
21 use {'wbthomason/packer.nvim', opt = true}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
22
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
23 -- General plugins
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
24 use {'tpope/vim-sensible'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
25 use {'tpope/vim-repeat'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
26 use {'tpope/vim-rsi'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
27 use {'sgur/vim-editorconfig'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
28 use {'ShikChen/osc52.vim'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
29 use {'einfachtoll/didyoumean'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
30
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
31 use {'tpope/vim-obsession'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
32 use {
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
33 'tpope/vim-eunuch',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
34 cmd = {
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
35 'Remove',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
36 'Unlink',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
37 'Move',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
38 'Rename',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
39 'Mkdir',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
40 'Chmod',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
41 'Find',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
42 'Locate',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
43 'SudoEdit',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
44 'SudoWrite'
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
45 }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
46 }
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
47
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
48 use {'psliwka/vim-smoothie'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
49
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
50 -- Spelling/autocorrection
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
51 use {'tpope/vim-abolish'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
52
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
53 -- Git/VCS
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
54 use {'vim-scripts/gitignore'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
55 use {'sjl/splice.vim', opt = true, cmd = {'SpliceInit'}}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
56 use {'tpope/vim-git'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
57
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
58 -- Comments
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
59 use {'tpope/vim-commentary'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
60
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
61 -- Undoing
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
62 use {'sjl/gundo.vim', cmd = {'GundoToggle'}}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
63
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
64 -- Parentheses etc
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
65 use {'tpope/vim-surround'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
66 use {'raimondi/delimitMate'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
67
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
68 -- Moving around within lines
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
69 use {'wellle/targets.vim', event = 'InsertEnter *'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
70
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
71 -- Searching
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
72 use {'mhinz/vim-grepper', cmd = {'Grepper'}}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
73
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
74 -- Indent lines
352
678cb3fdb667 Update to latest version of indent-blankline
Zeger Van de Vannet <zegervdv@me.com>
parents: 350
diff changeset
75 use {
678cb3fdb667 Update to latest version of indent-blankline
Zeger Van de Vannet <zegervdv@me.com>
parents: 350
diff changeset
76 'lukas-reineke/indent-blankline.nvim',
678cb3fdb667 Update to latest version of indent-blankline
Zeger Van de Vannet <zegervdv@me.com>
parents: 350
diff changeset
77 branch = 'lua',
678cb3fdb667 Update to latest version of indent-blankline
Zeger Van de Vannet <zegervdv@me.com>
parents: 350
diff changeset
78 config = function ()
354
d6c684c651bf Disable indentlines in help and non-file buffers
Zeger Van de Vannet <zegervdv@me.com>
parents: 352
diff changeset
79 vim.g.indent_blankline_buftype_exclude = {'terminal', 'help', 'nofile'}
362
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
80 vim.g.indent_blankline_show_first_indent_level = false
352
678cb3fdb667 Update to latest version of indent-blankline
Zeger Van de Vannet <zegervdv@me.com>
parents: 350
diff changeset
81 end
678cb3fdb667 Update to latest version of indent-blankline
Zeger Van de Vannet <zegervdv@me.com>
parents: 350
diff changeset
82 }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
83
362
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
84 -- Increment/decrement
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
85 use {
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
86 'zegervdv/nrpattern.nvim',
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
87 requires = 'tpope/vim-repeat',
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
88 config = function ()
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
89 local nrpattern = require"nrpattern"
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
90 local defaults = require"nrpattern.default"
368
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
91
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
92 defaults[{"input", "output"}] = {
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
93 priority = 12,
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
94 filetypes = {"verilog", "systemverilog"},
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
95 }
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
96 defaults[{"'1", "'0"}] = {
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
97 priority = 9,
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
98 filetypes = {"verilog", "systemverilog"},
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
99 }
362
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
100
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
101 nrpattern.setup(defaults)
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
102 end,
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
103 }
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
104
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
105 -- Tmux
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
106 function test_tmux()
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
107 return os.getenv('TMUX') ~= nil
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
108 end
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
109 use {'christoomey/vim-tmux-navigator'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
110 use {'tmux-plugins/vim-tmux-focus-events', cond = test_tmux}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
111
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
112 -- Completion/snippets/LSP
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
113 use {'neovim/nvim-lspconfig'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
114 use {
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
115 'hrsh7th/nvim-compe',
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
116 config = function ()
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
117 require'compe'.setup {
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
118 enabled = true;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
119 autocomplete = true;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
120 debug = false;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
121 min_length = 1;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
122 preselect = 'enable';
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
123 throttle_time = 80;
366
42bc7d63537e Map <c-y> to trigger completion in compe
zegervdv <zegervdv@me.com>
parents: 364
diff changeset
124 source_timeout = 1000;
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
125 incomplete_delay = 400;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
126 max_abbr_width = 100;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
127 max_kind_width = 100;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
128 max_menu_width = 100;
366
42bc7d63537e Map <c-y> to trigger completion in compe
zegervdv <zegervdv@me.com>
parents: 364
diff changeset
129 documentation = true;
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
130
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
131 source = {
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
132 path = true;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
133 buffer = true;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
134 nvim_lsp = true;
349
3d01318e4743 Tweak settings for compe
Zeger Van de Vannet <zegervdv@me.com>
parents: 346
diff changeset
135 nvim_lua = true;
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
136 spell = true;
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
137 ultisnips = true;
366
42bc7d63537e Map <c-y> to trigger completion in compe
zegervdv <zegervdv@me.com>
parents: 364
diff changeset
138 -- TODO add vsnip for LSP snippets
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
139 };
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
140 }
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
141
366
42bc7d63537e Map <c-y> to trigger completion in compe
zegervdv <zegervdv@me.com>
parents: 364
diff changeset
142 vim.cmd [[ inoremap <silent><expr> <C-y> compe#complete() ]]
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
143 vim.cmd [[ inoremap <silent><expr> <CR> compe#confirm({ 'keys': "\<Plug>delimitMateCR", 'mode': '' }) ]]
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
144 vim.cmd [[ inoremap <silent><expr> <C-e> compe#close('<C-e>') ]]
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
145 end
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
146 }
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
147 use {
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
148 'nvim-treesitter/nvim-treesitter',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
149 'nvim-treesitter/nvim-treesitter-refactor',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
150 'nvim-treesitter/nvim-treesitter-textobjects',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
151 {'nvim-treesitter/playground', opt = true}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
152 }
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
153 use {'SirVer/ultisnips'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
154 use {
342
fbec60e4ee05 Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents: 338
diff changeset
155 'glepnir/lspsaga.nvim',
fbec60e4ee05 Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents: 338
diff changeset
156 config = function()
350
a9910306741c Disable highlighting with treesitter
Zeger Van de Vannet <zegervdv@me.com>
parents: 349
diff changeset
157 require 'lspsaga'.init_lsp_saga {}
342
fbec60e4ee05 Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents: 338
diff changeset
158 end
fbec60e4ee05 Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents: 338
diff changeset
159 }
fbec60e4ee05 Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents: 338
diff changeset
160 use {
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
161 'nvim-telescope/telescope.nvim',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
162 requires = {
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
163 'nvim-lua/popup.nvim',
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
164 'nvim-lua/plenary.nvim'
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
165 }
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
166 }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
167
363
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
168 -- Vanity
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
169 use {
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
170 'yamatsum/nvim-web-nonicons',
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
171 requires = 'kyazdani42/nvim-web-devicons',
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
172 config = function()
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
173 require'nvim-nonicons'
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
174 end
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
175 }
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
176
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
177 use {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
178 'glepnir/galaxyline.nvim',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
179 branch = 'main',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
180 -- your statusline
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
181 config = function()
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
182 local gl = require'galaxyline'
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
183 local colors = require('galaxyline.theme').default
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
184 local condition = require('galaxyline.condition')
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
185 local gls = gl.section
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
186
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
187 colors.bg = '#2C323C'
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
188
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
189 gls.left[1] = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
190 RainbowRed = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
191 provider = function() return '▊ ' end,
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
192 highlight = {colors.blue,colors.bg}
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
193 },
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
194 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
195
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
196 gls.left[2] = {
363
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
197 FileIcon = {
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
198 provider = 'FileIcon',
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
199 condition = condition.buffer_not_empty,
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
200 highlight = {require('galaxyline.provider_fileinfo').get_file_icon_color, colors.bg},
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
201 },
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
202 }
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
203
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
204 gls.left[3] = {
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
205 FileName = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
206 provider = 'FileName',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
207 condition = condition.buffer_not_empty,
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
208 highlight = {colors.magenta,colors.bg,'bold'}
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
209 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
210 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
211
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
212
363
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
213 gls.left[4] = {
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
214 DiagnosticError = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
215 provider = 'DiagnosticError',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
216 icon = '  ',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
217 highlight = {colors.red,colors.bg}
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
218 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
219 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
220
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
221 gls.right[1] = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
222 ShowLspClient = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
223 provider = 'GetLspClient',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
224 condition = function ()
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
225 local tbl = {['dashboard'] = true,['']=true}
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
226 if tbl[vim.bo.filetype] then
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
227 return false
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
228 end
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
229 return true
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
230 end,
363
db80c8ac727d Add nonicons for nicer status lines
zegervdv <zegervdv@me.com>
parents: 362
diff changeset
231 icon = require'nvim-nonicons'.get('server') .. ' LSP:',
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
232 highlight = {colors.green,colors.bg,'bold'}
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
233 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
234 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
235
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
236 gls.right[2] = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
237 LineInfo = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
238 provider = 'LineColumn',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
239 separator = ' ',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
240 separator_highlight = {'NONE',colors.bg},
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
241 highlight = {colors.fg,colors.bg},
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
242 },
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
243 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
244
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
245 gls.right[3] = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
246 PerCent = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
247 provider = 'LinePercent',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
248 separator = ' ',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
249 separator_highlight = {'NONE',colors.bg},
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
250 highlight = {colors.fg,colors.bg,'bold'},
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
251 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
252 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
253 gls.right[8] = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
254 RainbowBlue = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
255 provider = function() return ' ▊' end,
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
256 highlight = {colors.blue,colors.bg}
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
257 },
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
258 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
259
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
260 gls.short_line_left[1] = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
261 BufferType = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
262 provider = 'FileTypeName',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
263 separator = ' ',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
264 separator_highlight = {'NONE',colors.bg},
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
265 highlight = {colors.blue,colors.bg,'bold'}
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
266 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
267 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
268
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
269 gls.short_line_left[2] = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
270 SFileName = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
271 provider = 'SFileName',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
272 condition = condition.buffer_not_empty,
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
273 highlight = {colors.fg,colors.bg,'bold'}
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
274 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
275 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
276
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
277 gls.short_line_right[1] = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
278 BufferIcon = {
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
279 provider= 'BufferIcon',
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
280 highlight = {colors.fg,colors.bg}
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
281 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
282 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
283 end,
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
284 }
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
285
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
286 -- File navigation
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
287 use {'justinmk/vim-dirvish'}
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
288
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
289 -- Colorscheme
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
290 use {'zegervdv/nvcode-color-schemes.vim'}
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
291
338
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
292 -- Terminal
362
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
293 use {
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
294 'akinsho/nvim-toggleterm.lua',
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
295 config = function()
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
296 require'toggleterm'.setup {
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
297 size = 20,
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
298 open_mapping = [[<F12>]],
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
299 shade_filetypes = {},
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
300 shade_terminals = true,
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
301 persist_size = true,
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
302 direction = 'horizontal',
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
303 }
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
304 end,
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
305 }
338
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
306
368
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
307 -- Filetypes
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
308 use {'Glench/Vim-Jinja2-Syntax'}
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
309
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
310 end)
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
311 end
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
312
336
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
313 -- This came from https://github.com/tjdevries/config_manager/blob/master/xdg_config/nvim/lua/lsp_config.lua
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
314 local mapper = function(mode, key, result, noremap)
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
315 if noremap == nil then
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
316 noremap = true
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
317 end
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
318 vim.api.nvim_buf_set_keymap(0, mode, key, result, {noremap=noremap, silent=true})
336
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
319 end
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
320
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
321 -- LSP and Treesitter config
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
322
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
323 local lsp = require'lspconfig'
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
324 local lsputil = require'lspconfig.util'
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
325
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
326 require "nvim-treesitter.highlight"
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
327
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
328 require'nvim-treesitter.configs'.setup {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
329 highlight = {
350
a9910306741c Disable highlighting with treesitter
Zeger Van de Vannet <zegervdv@me.com>
parents: 349
diff changeset
330 enable = false,
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
331 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
332 incremental_selection = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
333 enable = true,
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
334 keymaps = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
335 init_selection = "gnn",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
336 node_incremental = "grn",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
337 scope_incremental = "grc",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
338 node_decremental = "grm",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
339 }
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
340 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
341 refactor = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
342 highlight_definitions = { enable = true },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
343 smart_rename = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
344 enable = true,
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
345 keymaps = {
328
855380bb5a3b Fix overlapping mappings for treesitter rename and find references
Zeger Van de Vannet <zegervdv@me.com>
parents: 327
diff changeset
346 smart_rename = "gsr",
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
347 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
348 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
349 navigation = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
350 enable = true,
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
351 keymaps = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
352 goto_definition = "gnd",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
353 list_definitions = "gnD",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
354 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
355 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
356 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
357 textobjects = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
358 move = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
359 enable = true,
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
360 goto_next_start = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
361 ["]]"] = "@block.outer",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
362 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
363 goto_previous_start = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
364 ["[["] = "@block.outer",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
365 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
366 goto_next_end = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
367 ["]["] = "@block.outer",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
368 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
369 goto_previous_end = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
370 ["[]"] = "@block.outer",
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
371 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
372 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
373 },
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
374 playground = {
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
375 enable = true,
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
376 disable = {},
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
377 updatetime = 25,
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
378 persist_queries = false
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
379 }
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
380 }
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
381
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
382 local on_attach = function(client)
356
f7b97becaa64 Enable lsp saga for lsp diagnostics
zegervdv <zegervdv@me.com>
parents: 354
diff changeset
383 mapper('n', '<CR>', '<cmd>lua require"lspsaga.diagnostic".show_line_diagnostics()<CR>')
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
384 mapper('n', 'gd', '<cmd>lua vim.lsp.buf.declaration()<CR>')
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
385 mapper('n', '<c-]>', '<cmd>lua vim.lsp.buf.definition()<CR>')
345
9360c61c5732 Update lspsaga config and mapping for hover
zegervdv <zegervdv@me.com>
parents: 343
diff changeset
386 mapper('n', 'K', '<cmd>lua require"lspsaga.hover".render_hover_doc()<CR>')
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
387 mapper('n', 'gD', '<cmd>lua vim.lsp.buf.implementation()<CR>')
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
388 mapper('n', '1gD', '<cmd>lua vim.lsp.buf.type_definition()<CR>')
335
cd9a31235699 Add mapping to show references in quickfix list
zegervdv <zegervdv@me.com>
parents: 333
diff changeset
389 mapper('n', 'gr', "<cmd>lua vim.lsp.buf.references()<CR>")
cd9a31235699 Add mapping to show references in quickfix list
zegervdv <zegervdv@me.com>
parents: 333
diff changeset
390 mapper('n', 'tgr', "<cmd>lua require'telescope.builtin'.lsp_references()<CR>")
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
391 mapper('n', 'g0', '<cmd>lua vim.lsp.buf.document_symbol()<CR>')
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
392 mapper('i', '<c-l>', '<cmd>lua vim.lsp.buf.signature_help()<CR>')
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
393 mapper('n', '<leader>f', '<cmd>lua vim.lsp.buf.code_action()<CR>')
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
394 mapper('n', '<c-p>', '<cmd>lua vim.lsp.buf.formatting()<CR>')
368
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
395 mapper("n", "gp", "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>")
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
396 end
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
397
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
398
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
399 vim.lsp.handlers["textDocument/formatting"] = function(err, _, result, _, bufnr)
364
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
400 if err ~= nil or result == nil then
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
401 return
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
402 end
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
403 if not vim.api.nvim_buf_get_option(bufnr, "modified") then
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
404 local view = vim.fn.winsaveview()
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
405 vim.lsp.util.apply_text_edits(result, bufnr)
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
406 -- Fix to reload Treesitter
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
407 -- vim.api.nvim_command("edit")
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
408 vim.fn.winrestview(view)
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
409 end
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
410 end
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
411
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
412 vim.lsp.handlers["textDocument/publishDiagnostics"] = function(...)
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
413 vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
414 underline = true,
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
415 update_in_insert = false
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
416 })(...)
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
417 end
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
418
333
a3a0de56b0eb Switch to pyright LSP for python
zegervdv <zegervdv@me.com>
parents: 332
diff changeset
419 lsp.pyright.setup{
364
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
420 on_attach = on_attach;
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
421 }
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
422
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
423 if (vim.fn.executable('efm-langserver') == 1) then
323
3b25f3aa7014 Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents: 322
diff changeset
424 require 'efm/python'
322
deb606f02fc4 Test if flake8, black are available before adding
zegervdv <zegervdv@me.com>
parents: 321
diff changeset
425
323
3b25f3aa7014 Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents: 322
diff changeset
426 -- May not be installed, use pcall to handle errors
368
72e8dd5a4ab5 Clean up LSP peek functions
Zeger Van de Vannet <zegervdv@me.com>
parents: 367
diff changeset
427 -- pcall(require, 'efm/systemverilog')
327
3b191bcd4e0d Add efm config
zegervdv <zegervdv@me.com>
parents: 326
diff changeset
428 pcall(require, 'efm/flp')
323
3b25f3aa7014 Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents: 322
diff changeset
429
3b25f3aa7014 Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents: 322
diff changeset
430 local language_cfg = require'efm/languages'
322
deb606f02fc4 Test if flake8, black are available before adding
zegervdv <zegervdv@me.com>
parents: 321
diff changeset
431
367
f0a89299e854 Enable EFM only on selected filetypes
zegervdv <zegervdv@me.com>
parents: 366
diff changeset
432 local filetypes = {}
f0a89299e854 Enable EFM only on selected filetypes
zegervdv <zegervdv@me.com>
parents: 366
diff changeset
433 for lang, _ in pairs(language_cfg) do
f0a89299e854 Enable EFM only on selected filetypes
zegervdv <zegervdv@me.com>
parents: 366
diff changeset
434 table.insert(filetypes, lang)
f0a89299e854 Enable EFM only on selected filetypes
zegervdv <zegervdv@me.com>
parents: 366
diff changeset
435 end
f0a89299e854 Enable EFM only on selected filetypes
zegervdv <zegervdv@me.com>
parents: 366
diff changeset
436
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
437 lsp.efm.setup{
367
f0a89299e854 Enable EFM only on selected filetypes
zegervdv <zegervdv@me.com>
parents: 366
diff changeset
438 on_attach = on_attach,
f0a89299e854 Enable EFM only on selected filetypes
zegervdv <zegervdv@me.com>
parents: 366
diff changeset
439 filetypes = filetypes,
f0a89299e854 Enable EFM only on selected filetypes
zegervdv <zegervdv@me.com>
parents: 366
diff changeset
440 init_options = {documentFormatting = true},
f0a89299e854 Enable EFM only on selected filetypes
zegervdv <zegervdv@me.com>
parents: 366
diff changeset
441 root_dir = lsputil.root_pattern('.git', '.hg'),
321
aa0a095f8759 Set up python formatting and linting through efm
zegervdv <zegervdv@me.com>
parents: 319
diff changeset
442 settings = {
aa0a095f8759 Set up python formatting and linting through efm
zegervdv <zegervdv@me.com>
parents: 319
diff changeset
443 rootMarkers = {".git/", ".hg/"},
323
3b25f3aa7014 Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents: 322
diff changeset
444 languages = language_cfg
367
f0a89299e854 Enable EFM only on selected filetypes
zegervdv <zegervdv@me.com>
parents: 366
diff changeset
445 },
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
446 }
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
447 end
332
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
448
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
449 -- Try importing local config
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
450 local ok, localconfig = pcall(require, 'localconfig')
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
451 if ok then
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
452 localconfig.setup {on_attach=on_attach}
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
453 end