annotate dot_config/nvim/config.lua @ 394:a80312c2755b

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