Mercurial > dotfiles
annotate dot_config/nvim/config.lua @ 362:c2c870fb8095
Add nrpattern with config
author | zegervdv <zegervdv@me.com> |
---|---|
date | Mon, 15 Mar 2021 09:06:52 +0100 |
parents | 337eb27fc66e |
children | db80c8ac727d |
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 | 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 | 84 -- Increment/decrement |
85 use { | |
86 'zegervdv/nrpattern.nvim', | |
87 requires = 'tpope/vim-repeat', | |
88 config = function () | |
89 local nrpattern = require"nrpattern" | |
90 local defaults = require"nrpattern.default" | |
91 | |
92 nrpattern.setup(defaults) | |
93 end, | |
94 } | |
95 | |
325
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
96 -- Tmux |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
97 function test_tmux() |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
98 return os.getenv('TMUX') ~= nil |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
99 end |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
100 use {'christoomey/vim-tmux-navigator'} |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
101 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
|
102 |
325
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
103 -- Completion/snippets/LSP |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
104 use {'neovim/nvim-lspconfig'} |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
105 use { |
346
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
106 'hrsh7th/nvim-compe', |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
107 config = function () |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
108 require'compe'.setup { |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
109 enabled = true; |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
110 autocomplete = true; |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
111 debug = false; |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
112 min_length = 1; |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
113 preselect = 'enable'; |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
114 throttle_time = 80; |
349
3d01318e4743
Tweak settings for compe
Zeger Van de Vannet <zegervdv@me.com>
parents:
346
diff
changeset
|
115 source_timeout = 2000; |
346
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
116 incomplete_delay = 400; |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
117 max_abbr_width = 100; |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
118 max_kind_width = 100; |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
119 max_menu_width = 100; |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
120 |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
121 source = { |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
122 path = true; |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
123 buffer = true; |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
124 calc = true; |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
125 nvim_lsp = true; |
349
3d01318e4743
Tweak settings for compe
Zeger Van de Vannet <zegervdv@me.com>
parents:
346
diff
changeset
|
126 nvim_lua = true; |
346
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
127 spell = true; |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
128 ultisnips = true; |
349
3d01318e4743
Tweak settings for compe
Zeger Van de Vannet <zegervdv@me.com>
parents:
346
diff
changeset
|
129 treesitter = 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 } |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
132 |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
133 vim.cmd [[ inoremap <silent><expr> <TAB> compe#complete() ]] |
d717168f424f
Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents:
345
diff
changeset
|
134 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
|
135 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
|
136 end |
325
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
137 } |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
138 use { |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
139 'nvim-treesitter/nvim-treesitter', |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
140 'nvim-treesitter/nvim-treesitter-refactor', |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
141 'nvim-treesitter/nvim-treesitter-textobjects', |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
142 {'nvim-treesitter/playground', opt = true} |
324
64a0c6cec54c
Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents:
323
diff
changeset
|
143 } |
325
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
144 use {'SirVer/ultisnips'} |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
145 use { |
342
fbec60e4ee05
Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents:
338
diff
changeset
|
146 'glepnir/lspsaga.nvim', |
fbec60e4ee05
Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents:
338
diff
changeset
|
147 config = function() |
350
a9910306741c
Disable highlighting with treesitter
Zeger Van de Vannet <zegervdv@me.com>
parents:
349
diff
changeset
|
148 require 'lspsaga'.init_lsp_saga {} |
342
fbec60e4ee05
Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents:
338
diff
changeset
|
149 end |
fbec60e4ee05
Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents:
338
diff
changeset
|
150 } |
fbec60e4ee05
Add lspsaga for nicer LSP popups
zegervdv <zegervdv@me.com>
parents:
338
diff
changeset
|
151 use { |
325
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
152 'nvim-telescope/telescope.nvim', |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
153 requires = { |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
154 'nvim-lua/popup.nvim', |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
155 'nvim-lua/plenary.nvim' |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
156 } |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
157 } |
324
64a0c6cec54c
Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents:
323
diff
changeset
|
158 |
361 | 159 use { |
160 'glepnir/galaxyline.nvim', | |
161 branch = 'main', | |
162 -- your statusline | |
163 config = function() | |
164 local gl = require'galaxyline' | |
165 local colors = require('galaxyline.theme').default | |
166 local condition = require('galaxyline.condition') | |
167 local gls = gl.section | |
168 | |
169 colors.bg = '#2C323C' | |
170 | |
171 gls.left[1] = { | |
172 RainbowRed = { | |
173 provider = function() return '▊ ' end, | |
174 highlight = {colors.blue,colors.bg} | |
175 }, | |
176 } | |
177 | |
178 gls.left[2] = { | |
179 FileName = { | |
180 provider = 'FileName', | |
181 condition = condition.buffer_not_empty, | |
182 highlight = {colors.magenta,colors.bg,'bold'} | |
183 } | |
184 } | |
185 | |
186 | |
187 gls.left[5] = { | |
188 DiagnosticError = { | |
189 provider = 'DiagnosticError', | |
190 icon = ' ', | |
191 highlight = {colors.red,colors.bg} | |
192 } | |
193 } | |
194 | |
195 gls.right[1] = { | |
196 ShowLspClient = { | |
197 provider = 'GetLspClient', | |
198 condition = function () | |
199 local tbl = {['dashboard'] = true,['']=true} | |
200 if tbl[vim.bo.filetype] then | |
201 return false | |
202 end | |
203 return true | |
204 end, | |
205 icon = ' LSP:', | |
206 highlight = {colors.green,colors.bg,'bold'} | |
207 } | |
208 } | |
209 | |
210 gls.right[2] = { | |
211 LineInfo = { | |
212 provider = 'LineColumn', | |
213 separator = ' ', | |
214 separator_highlight = {'NONE',colors.bg}, | |
215 highlight = {colors.fg,colors.bg}, | |
216 }, | |
217 } | |
218 | |
219 gls.right[3] = { | |
220 PerCent = { | |
221 provider = 'LinePercent', | |
222 separator = ' ', | |
223 separator_highlight = {'NONE',colors.bg}, | |
224 highlight = {colors.fg,colors.bg,'bold'}, | |
225 } | |
226 } | |
227 gls.right[8] = { | |
228 RainbowBlue = { | |
229 provider = function() return ' ▊' end, | |
230 highlight = {colors.blue,colors.bg} | |
231 }, | |
232 } | |
233 | |
234 gls.short_line_left[1] = { | |
235 BufferType = { | |
236 provider = 'FileTypeName', | |
237 separator = ' ', | |
238 separator_highlight = {'NONE',colors.bg}, | |
239 highlight = {colors.blue,colors.bg,'bold'} | |
240 } | |
241 } | |
242 | |
243 gls.short_line_left[2] = { | |
244 SFileName = { | |
245 provider = 'SFileName', | |
246 condition = condition.buffer_not_empty, | |
247 highlight = {colors.fg,colors.bg,'bold'} | |
248 } | |
249 } | |
250 | |
251 gls.short_line_right[1] = { | |
252 BufferIcon = { | |
253 provider= 'BufferIcon', | |
254 highlight = {colors.fg,colors.bg} | |
255 } | |
256 } | |
257 end, | |
258 } | |
259 | |
325
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
260 -- File navigation |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
261 use {'justinmk/vim-dirvish'} |
324
64a0c6cec54c
Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents:
323
diff
changeset
|
262 |
325
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
263 -- Colorscheme |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
264 use {'zegervdv/nvcode-color-schemes.vim'} |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
265 |
338
890fe7d01f19
Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents:
337
diff
changeset
|
266 -- Terminal |
362 | 267 use { |
268 'akinsho/nvim-toggleterm.lua', | |
269 config = function() | |
270 require'toggleterm'.setup { | |
271 size = 20, | |
272 open_mapping = [[<F12>]], | |
273 shade_filetypes = {}, | |
274 shade_terminals = true, | |
275 persist_size = true, | |
276 direction = 'horizontal', | |
277 } | |
278 end, | |
279 } | |
338
890fe7d01f19
Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents:
337
diff
changeset
|
280 |
325
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
281 end) |
ce396166d009
Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents:
324
diff
changeset
|
282 end |
324
64a0c6cec54c
Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents:
323
diff
changeset
|
283 |
336
7a8b66395d69
Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents:
335
diff
changeset
|
284 -- 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
|
285 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
|
286 if noremap == nil then |
7a8b66395d69
Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents:
335
diff
changeset
|
287 noremap = true |
7a8b66395d69
Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents:
335
diff
changeset
|
288 end |
361 | 289 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
|
290 end |
7a8b66395d69
Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents:
335
diff
changeset
|
291 |
7a8b66395d69
Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents:
335
diff
changeset
|
292 -- LSP and Treesitter config |
324
64a0c6cec54c
Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents:
323
diff
changeset
|
293 |
319
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
294 local lsp = require'lspconfig' |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
295 local lsputil = require'lspconfig.util' |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
296 |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
297 require "nvim-treesitter.highlight" |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
298 |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
299 require'nvim-treesitter.configs'.setup { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
300 highlight = { |
350
a9910306741c
Disable highlighting with treesitter
Zeger Van de Vannet <zegervdv@me.com>
parents:
349
diff
changeset
|
301 enable = false, |
319
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
302 }, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
303 incremental_selection = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
304 enable = true, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
305 keymaps = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
306 init_selection = "gnn", |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
307 node_incremental = "grn", |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
308 scope_incremental = "grc", |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
309 node_decremental = "grm", |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
310 } |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
311 }, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
312 refactor = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
313 highlight_definitions = { enable = true }, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
314 smart_rename = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
315 enable = true, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
316 keymaps = { |
328
855380bb5a3b
Fix overlapping mappings for treesitter rename and find references
Zeger Van de Vannet <zegervdv@me.com>
parents:
327
diff
changeset
|
317 smart_rename = "gsr", |
319
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
318 }, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
319 }, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
320 navigation = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
321 enable = true, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
322 keymaps = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
323 goto_definition = "gnd", |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
324 list_definitions = "gnD", |
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 }, |
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 textobjects = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
329 move = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
330 enable = true, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
331 goto_next_start = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
332 ["]]"] = "@block.outer", |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
333 }, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
334 goto_previous_start = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
335 ["[["] = "@block.outer", |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
336 }, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
337 goto_next_end = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
338 ["]["] = "@block.outer", |
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 goto_previous_end = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
341 ["[]"] = "@block.outer", |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
342 }, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
343 }, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
344 }, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
345 playground = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
346 enable = true, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
347 disable = {}, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
348 updatetime = 25, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
349 persist_queries = false |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
350 } |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
351 } |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
352 |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
353 local chain_complete_list = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
354 default = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
355 default = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
356 {complete_items = {'lsp'}}, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
357 {complete_items = {'lsp', 'snippet', 'ts', 'buffer'}}, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
358 {complete_items = {'path'}, triggered_only = {'/'}}, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
359 {complete_items = {'ts'}}, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
360 }, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
361 string = { |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
362 {complete_items = {'path'}, triggered_only = {'/'}}, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
363 }, |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
364 comment = {}, |
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 } |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
367 |
330
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
368 -- Copied and modified from https://github.com/chengzeyi/.vim_runtime/blob/8a47981c81d31f88d1138211908e58fd58e4decc/lua/lsp_ext.lua |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
369 |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
370 function preview_location(location, context, before_context) |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
371 -- location may be LocationLink or Location (more useful for the former) |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
372 context = context or 15 |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
373 before_context = before_context or 0 |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
374 local uri = location.targetUri or location.uri |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
375 if uri == nil then |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
376 return |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
377 end |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
378 local bufnr = vim.uri_to_bufnr(uri) |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
379 if not vim.api.nvim_buf_is_loaded(bufnr) then |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
380 vim.fn.bufload(bufnr) |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
381 end |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
382 local range = location.targetRange or location.range |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
383 local contents = |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
384 vim.api.nvim_buf_get_lines(bufnr, range.start.line - before_context, range['end'].line + 1 + context, false) |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
385 local filetype = vim.api.nvim_buf_get_option(bufnr, 'filetype') |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
386 return vim.lsp.util.open_floating_preview(contents, filetype) |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
387 end |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
388 |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
389 function preview_location_callback(_, method, result) |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
390 local context = 15 |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
391 if result == nil or vim.tbl_isempty(result) then |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
392 return nil |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
393 end |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
394 if vim.tbl_islist(result) then |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
395 preview_location(result[1], context, 5) |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
396 else |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
397 preview_location(result, context, 5) |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
398 end |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
399 end |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
400 |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
401 function peek_declaration() |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
402 local params = vim.lsp.util.make_position_params() |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
403 return vim.lsp.buf_request(0, 'textDocument/declaration', params, preview_location_callback) |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
404 end |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
405 |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
406 function peek_definition() |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
407 local params = vim.lsp.util.make_position_params() |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
408 return vim.lsp.buf_request(0, 'textDocument/definition', params, preview_location_callback) |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
409 end |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
410 |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
411 function peek_type_definition() |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
412 local params = vim.lsp.util.make_position_params() |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
413 return vim.lsp.buf_request(0, 'textDocument/typeDefinition', params, preview_location_callback) |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
414 end |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
415 |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
416 function peek_implementation() |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
417 local params = vim.lsp.util.make_position_params() |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
418 return vim.lsp.buf_request(0, 'textDocument/implementation', params, preview_location_callback) |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
419 end |
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
420 |
319
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
421 local on_attach = function(client) |
356
f7b97becaa64
Enable lsp saga for lsp diagnostics
zegervdv <zegervdv@me.com>
parents:
354
diff
changeset
|
422 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
|
423 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
|
424 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
|
425 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
|
426 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
|
427 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
|
428 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
|
429 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
|
430 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
|
431 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
|
432 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
|
433 mapper('n', '<c-p>', '<cmd>lua vim.lsp.buf.formatting()<CR>') |
330
471701051c92
Add peek_declaration to show in floating preview window
Zeger Van de Vannet <zegervdv@me.com>
parents:
329
diff
changeset
|
434 mapper("n", "gp", "<cmd>lua peek_definition()<CR>") |
345
9360c61c5732
Update lspsaga config and mapping for hover
zegervdv <zegervdv@me.com>
parents:
343
diff
changeset
|
435 -- 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
|
436 end |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
437 |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
438 |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
439 vim.lsp.handlers["textDocument/formatting"] = function(err, _, result, _, bufnr) |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
440 if err ~= nil or result == nil then |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
441 return |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
442 end |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
443 if not vim.api.nvim_buf_get_option(bufnr, "modified") then |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
444 local view = vim.fn.winsaveview() |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
445 vim.lsp.util.apply_text_edits(result, bufnr) |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
446 -- Fix to reload Treesitter |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
447 -- vim.api.nvim_command("edit") |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
448 vim.fn.winrestview(view) |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
449 end |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
450 end |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
451 |
333
a3a0de56b0eb
Switch to pyright LSP for python
zegervdv <zegervdv@me.com>
parents:
332
diff
changeset
|
452 lsp.pyright.setup{ |
319
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
453 on_attach = on_attach; |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
454 } |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
455 |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
456 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
|
457 require 'efm/python' |
322
deb606f02fc4
Test if flake8, black are available before adding
zegervdv <zegervdv@me.com>
parents:
321
diff
changeset
|
458 |
323
3b25f3aa7014
Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents:
322
diff
changeset
|
459 -- May not be installed, use pcall to handle errors |
3b25f3aa7014
Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents:
322
diff
changeset
|
460 pcall(require, 'efm/systemverilog') |
327 | 461 pcall(require, 'efm/flp') |
323
3b25f3aa7014
Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents:
322
diff
changeset
|
462 |
3b25f3aa7014
Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents:
322
diff
changeset
|
463 local language_cfg = require'efm/languages' |
322
deb606f02fc4
Test if flake8, black are available before adding
zegervdv <zegervdv@me.com>
parents:
321
diff
changeset
|
464 |
319
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
465 lsp.efm.setup{ |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
466 on_attach = on_attach; |
321
aa0a095f8759
Set up python formatting and linting through efm
zegervdv <zegervdv@me.com>
parents:
319
diff
changeset
|
467 init_options = {documentFormatting = true}; |
319
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
468 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
|
469 settings = { |
aa0a095f8759
Set up python formatting and linting through efm
zegervdv <zegervdv@me.com>
parents:
319
diff
changeset
|
470 rootMarkers = {".git/", ".hg/"}, |
323
3b25f3aa7014
Use efm folders to store efm configuration per language
zegervdv <zegervdv@me.com>
parents:
322
diff
changeset
|
471 languages = language_cfg |
321
aa0a095f8759
Set up python formatting and linting through efm
zegervdv <zegervdv@me.com>
parents:
319
diff
changeset
|
472 }; |
319
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
473 } |
b93f12d23fbd
Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff
changeset
|
474 end |
332
5b166328c2fd
Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents:
331
diff
changeset
|
475 |
5b166328c2fd
Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents:
331
diff
changeset
|
476 -- 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
|
477 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
|
478 if ok then |
5b166328c2fd
Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents:
331
diff
changeset
|
479 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
|
480 end |