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