annotate dot_config/nvim/config.lua @ 406:270a0f0f4c7f

Format with stylua
author zegervdv <zegervdv@me.com>
date Fri, 16 Jul 2021 18:36:50 +0200
parents 34862cc22221
children 4406fc85ba0a
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
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
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
401
7948403a514c Add plenary for local config scripts
Zeger Van de Vannet <zegervdv@me.com>
parents: 400
diff changeset
51 use { 'nvim-lua/plenary.nvim' }
7948403a514c Add plenary for local config scripts
Zeger Van de Vannet <zegervdv@me.com>
parents: 400
diff changeset
52
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
53 -- Spelling/autocorrection
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
54 use { 'tpope/vim-abolish' }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
55
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
56 -- Git/VCS
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
57 use { 'vim-scripts/gitignore' }
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
58 use { 'sjl/splice.vim', opt = true, cmd = { 'SpliceInit' } }
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
59 use { 'tpope/vim-git' }
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
60
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
61 -- Comments
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
62 use { 'b3nj5m1n/kommentary' }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
63
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
64 -- Undoing
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
65 use { 'sjl/gundo.vim', cmd = { 'GundoToggle' } }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
66
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
67 -- Parentheses etc
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
68 use { 'tpope/vim-surround' }
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
69 use { 'raimondi/delimitMate' }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
70
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
71 -- Moving around within lines
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
72 use { 'wellle/targets.vim', event = 'InsertEnter *' }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
73
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
74 -- Searching
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
75 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
76
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
77 -- Keymaps TODO: to be removed when #13823 is merged
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
78 use {
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
79 'tjdevries/astronauta.nvim',
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
80 config = function()
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
81 require 'astronauta.keymap'
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
82 end,
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
83 }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
84
399
59db83251de2 Add vim-fetch to open file patterns with linenrs/colnrs
zegervdv <zegervdv@me.com>
parents: 398
diff changeset
85 -- Opening files
59db83251de2 Add vim-fetch to open file patterns with linenrs/colnrs
zegervdv <zegervdv@me.com>
parents: 398
diff changeset
86 use { 'wsdjeg/vim-fetch' }
59db83251de2 Add vim-fetch to open file patterns with linenrs/colnrs
zegervdv <zegervdv@me.com>
parents: 398
diff changeset
87
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
88 -- Indent lines
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
89 use {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
90 'lukas-reineke/indent-blankline.nvim',
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
91 config = function()
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
92 vim.g.indent_blankline_buftype_exclude = { 'terminal', 'help', 'nofile' }
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
93 vim.g.indent_blankline_show_first_indent_level = false
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
94 end,
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
95 }
371
1dfda47d5d9e Add more lua based plugins: lush, navigator, numb
zegervdv <zegervdv@me.com>
parents: 370
diff changeset
96
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
97 -- Increment/decrement
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
98 use {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
99 'zegervdv/nrpattern.nvim',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
100 requires = 'tpope/vim-repeat',
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
101 config = function()
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
102 local nrpattern = require 'nrpattern'
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
103 local defaults = require 'nrpattern.default'
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
104
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
105 defaults[{ 'input', 'output' }] = { priority = 12, filetypes = { 'verilog', 'systemverilog' } }
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
106 defaults[{ "'1", "'0" }] = { priority = 9, filetypes = { 'verilog', 'systemverilog' } }
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
107
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
108 nrpattern.setup(defaults)
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
109 end,
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
110 }
362
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
111
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
112 -- Tmux
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
113 use {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
114 'numtostr/navigator.nvim',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
115 config = function()
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
116 require('Navigator').setup { auto_save = 'current', disable_on_zoom = true }
362
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
117
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
118 local nnoremap = vim.keymap.nnoremap
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
119 nnoremap { '<c-h>', require('Navigator').left, silent = true }
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
120 nnoremap { '<c-j>', require('Navigator').down, silent = true }
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
121 nnoremap { '<c-k>', require('Navigator').up, silent = true }
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
122 nnoremap { '<c-l>', require('Navigator').right, silent = true }
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
123 end,
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
124 requires = 'tjdevries/astronauta.nvim',
390
bfaff08e7e54 Run navigator cfg after astronauta is loaded
Zeger Van de Vannet <zegervdv@me.com>
parents: 389
diff changeset
125 after = 'astronauta.nvim',
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
126 }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
127
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
128 -- Completion/snippets/LSP
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
129 use { 'neovim/nvim-lspconfig' }
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
130 use {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
131 'hrsh7th/nvim-compe',
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
132 config = function()
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
133 require('compe').setup {
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
134 enabled = true,
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
135 autocomplete = true,
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
136 debug = false,
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
137 min_length = 1,
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
138 preselect = 'enable',
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
139 throttle_time = 80,
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
140 source_timeout = 1000,
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
141 incomplete_delay = 400,
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
142 max_abbr_width = 100,
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
143 max_kind_width = 100,
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
144 max_menu_width = 100,
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
145 documentation = true,
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
146
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
147 source = {
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
148 path = true,
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
149 buffer = true,
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
150 nvim_lsp = true,
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
151 nvim_lua = true,
402
13fc3aebcf46 Disable spell completions
Zeger Van de Vannet <zegervdv@me.com>
parents: 401
diff changeset
152 spell = false,
388
80a9a2b73eac Use vsnip for snippets
zegervdv <zegervdv@me.com>
parents: 386
diff changeset
153 vsnip = true,
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
154 },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
155 }
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
156
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
157 vim.cmd [[ inoremap <silent><expr> <C-y> compe#complete() ]]
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
158 vim.cmd [[ inoremap <silent><expr> <CR> compe#confirm({ 'keys': "\<Plug>delimitMateCR", 'mode': '' }) ]]
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
159 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
160 end,
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
161 }
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
162 use {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
163 {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
164 'nvim-treesitter/nvim-treesitter',
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
165 config = function()
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
166 require 'nvim-treesitter.highlight'
370
5ffb0fd7b98d Move treesitter config into packer_compiled
zegervdv <zegervdv@me.com>
parents: 368
diff changeset
167
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
168 require('nvim-treesitter.configs').setup {
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
169 highlight = { enable = false },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
170 incremental_selection = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
171 enable = true,
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
172 keymaps = {
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
173 init_selection = 'gnn',
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
174 node_incremental = 'grn',
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
175 scope_incremental = 'grc',
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
176 node_decremental = 'grm',
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
177 },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
178 },
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
179 refactor = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
180 highlight_definitions = { enable = true },
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
181 smart_rename = { enable = true, keymaps = { smart_rename = 'gsr' } },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
182 navigation = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
183 enable = true,
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
184 keymaps = { goto_definition = 'gnd', list_definitions = 'gnD' },
370
5ffb0fd7b98d Move treesitter config into packer_compiled
zegervdv <zegervdv@me.com>
parents: 368
diff changeset
185 },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
186 },
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
187 textobjects = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
188 move = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
189 enable = true,
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
190 goto_next_start = { [']]'] = '@block.outer' },
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
191 goto_previous_start = { ['[['] = '@block.outer' },
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
192 goto_next_end = { [']['] = '@block.outer' },
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
193 goto_previous_end = { ['[]'] = '@block.outer' },
370
5ffb0fd7b98d Move treesitter config into packer_compiled
zegervdv <zegervdv@me.com>
parents: 368
diff changeset
194 },
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
195 },
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
196 playground = { enable = true, disable = {}, updatetime = 25, persist_queries = false },
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
197 }
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
198 end,
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
199 },
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
200 'nvim-treesitter/nvim-treesitter-refactor',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
201 'nvim-treesitter/nvim-treesitter-textobjects',
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
202 { 'nvim-treesitter/playground', opt = true },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
203 }
388
80a9a2b73eac Use vsnip for snippets
zegervdv <zegervdv@me.com>
parents: 386
diff changeset
204 use { 'hrsh7th/vim-vsnip', requires = 'hrsh7th/vim-vsnip-integ' }
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
205 use {
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
206 'glepnir/lspsaga.nvim',
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
207 config = function()
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
208 require('lspsaga').init_lsp_saga {}
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
209 end,
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
210 }
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
211 use {
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
212 'rmagatti/goto-preview',
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
213 config = function()
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
214 require('goto-preview').setup {}
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
215 end,
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
216 }
404
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
217 use {
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
218 'jose-elias-alvarez/null-ls.nvim',
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
219 requires = 'nvim-lua/plenary.nvim',
404
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
220 }
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 -- Vanity
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
223 use {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
224 'yamatsum/nvim-web-nonicons',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
225 requires = 'kyazdani42/nvim-web-devicons',
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
226 config = function()
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
227 require 'nvim-nonicons'
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
228 end,
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
229 }
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
230
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
231 use {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
232 'glepnir/galaxyline.nvim',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
233 branch = 'main',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
234 -- your statusline
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
235 config = function()
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
236 local gl = require 'galaxyline'
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
237 local colors = require('galaxyline.theme').default
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
238 local condition = require 'galaxyline.condition'
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
239 local gls = gl.section
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
240
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
241 colors.bg = '#2C323C'
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
242
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
243 gls.left[1] = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
244 RainbowRed = {
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
245 provider = function()
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
246 return '▊ '
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
247 end,
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
248 highlight = { colors.blue, colors.bg },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
249 },
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
250 }
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
251
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
252 gls.left[2] = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
253 FileIcon = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
254 provider = 'FileIcon',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
255 condition = condition.buffer_not_empty,
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
256 highlight = { require('galaxyline.provider_fileinfo').get_file_icon_color, colors.bg },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
257 },
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
258 }
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
259
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
260 gls.left[3] = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
261 FileName = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
262 provider = 'FileName',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
263 condition = condition.buffer_not_empty,
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
264 highlight = { colors.magenta, colors.bg, 'bold' },
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
265 },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
266 }
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
267
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
268 gls.right[1] = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
269 ShowLspClient = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
270 provider = 'GetLspClient',
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
271 condition = function()
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
272 local tbl = { ['dashboard'] = true, [''] = true }
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
273 if tbl[vim.bo.filetype] then
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
274 return false
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
275 end
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
276 return true
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
277 end,
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
278 icon = require('nvim-nonicons').get 'server' .. ' LSP:',
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
279 highlight = { colors.green, colors.bg, 'bold' },
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
280 },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
281 }
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
282
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
283 gls.right[2] = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
284 LineInfo = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
285 provider = 'LineColumn',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
286 separator = ' ',
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
287 separator_highlight = { 'NONE', colors.bg },
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
288 highlight = { colors.fg, colors.bg },
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 }
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
291
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
292 gls.right[3] = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
293 PerCent = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
294 provider = 'LinePercent',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
295 separator = ' ',
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
296 separator_highlight = { 'NONE', colors.bg },
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
297 highlight = { colors.fg, colors.bg, 'bold' },
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
298 },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
299 }
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
300 gls.right[8] = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
301 RainbowBlue = {
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
302 provider = function()
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
303 return ' ▊'
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
304 end,
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
305 highlight = { colors.blue, colors.bg },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
306 },
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
307 }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
308
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
309 gls.short_line_left[1] = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
310 BufferType = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
311 provider = 'FileTypeName',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
312 separator = ' ',
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
313 separator_highlight = { 'NONE', colors.bg },
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
314 highlight = { colors.blue, colors.bg, 'bold' },
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
315 },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
316 }
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
317
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
318 gls.short_line_left[2] = {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
319 SFileName = {
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
320 provider = 'SFileName',
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
321 condition = condition.buffer_not_empty,
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
322 highlight = { colors.fg, colors.bg, 'bold' },
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
323 },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
324 }
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
325
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
326 gls.short_line_right[1] = {
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
327 BufferIcon = { provider = 'BufferIcon', highlight = { colors.fg, colors.bg } },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
328 }
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
329 end,
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
330 }
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
331
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
332 -- File navigation
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
333 use { 'justinmk/vim-dirvish' }
338
890fe7d01f19 Use toggleterm as more robust terminal integration
zegervdv <zegervdv@me.com>
parents: 337
diff changeset
334
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
335 -- Colorscheme
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
336 use {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
337 'zegervdv/one-lush',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
338 requires = 'rktjmp/lush.nvim',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
339 config = function()
381
c3ea313def61 Set LSP signcolumn symbols
zegervdv <zegervdv@me.com>
parents: 380
diff changeset
340 require 'lush_theme.one-lush'
c3ea313def61 Set LSP signcolumn symbols
zegervdv <zegervdv@me.com>
parents: 380
diff changeset
341 vim.cmd [[ colorscheme one-lush ]]
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
342 end,
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
343 }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
344
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
345 -- Terminal
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
346 use {
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
347 'akinsho/nvim-toggleterm.lua',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
348 config = function()
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
349 require('toggleterm').setup {
381
c3ea313def61 Set LSP signcolumn symbols
zegervdv <zegervdv@me.com>
parents: 380
diff changeset
350 size = 15,
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
351 open_mapping = [[<F12>]],
381
c3ea313def61 Set LSP signcolumn symbols
zegervdv <zegervdv@me.com>
parents: 380
diff changeset
352 shade_filetypes = { 'none' },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
353 shade_terminals = true,
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
354 persist_size = true,
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
355 direction = 'horizontal',
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
356 }
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
357 end,
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
358 }
336
7a8b66395d69 Add floating terminal to be toggled via c-z
zegervdv <zegervdv@me.com>
parents: 335
diff changeset
359
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
360 -- Filetypes
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
361 use { 'Glench/Vim-Jinja2-Syntax' }
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
362 end)
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
363
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
364 -- LSP config
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
365 local lsp = require 'lspconfig'
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
366 local lsputil = require 'lspconfig.util'
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
367 local null_ls = require 'null-ls'
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
368
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
369 local on_attach = function(client)
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
370 local nnoremap = vim.keymap.nnoremap
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
371 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
372 -- nnoremap { '', require'lspsaga.diagnostic'.show_line_diagnostics, silent = true }
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
373 nnoremap { 'gd', vim.lsp.buf.declaration, silent = true }
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
374 nnoremap { '<c-]>', vim.lsp.buf.definition, silent = true }
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
375 nnoremap { 'K', require('lspsaga.hover').render_hover_doc, silent = true }
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
376 nnoremap { 'gD', vim.lsp.buf.implementation, silent = true }
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
377 nnoremap { '1gD', vim.lsp.buf.type_definition, silent = true }
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
378 nnoremap { 'gr', vim.lsp.buf.references, silent = true }
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
379 nnoremap { 'g0', vim.lsp.buf.document_symbol, silent = true }
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
380 nnoremap {
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
381 '<c-p>',
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
382 function()
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
383 vim.lsp.buf.formatting_sync({}, 5000)
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
384 end,
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
385 silent = true,
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
386 }
394
a80312c2755b Add goto-preview in favour of lspsaga for previewing
Zeger Van de Vannet <zegervdv@me.com>
parents: 390
diff changeset
387 -- nnoremap { 'gp', require'lspsaga.provider'.preview_definition, silent = true }
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
388 nnoremap { 'gp', require('goto-preview').goto_preview_definition, silent = true }
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
389 nnoremap { 'gP', require('goto-preview').close_all_win, silent = true }
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
390
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
391 inoremap { '<c-l>', vim.lsp.buf.signature_help, silent = true }
382
41a8b9f51e05 Clean up unused plugins
zegervdv <zegervdv@me.com>
parents: 381
diff changeset
392
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
393 vim.fn.sign_define(
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
394 'LspDiagnosticsSignError',
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
395 { texthl = 'LspDiagnosticsSignError', linehl = '', numhl = '', text = '▎' }
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
396 )
398
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
397 vim.fn.sign_define('LspDiagnosticsSignWarning', {
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
398 texthl = 'LspDiagnosticsSignWarning',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
399 linehl = '',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
400 numhl = '',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
401 text = '▎',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
402 })
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
403 vim.fn.sign_define('LspDiagnosticsSignInformation', {
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
404 texthl = 'LspDiagnosticsSignInformation',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
405 linehl = '',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
406 numhl = '',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
407 text = '▎',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
408 })
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
409 vim.fn.sign_define(
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
410 'LspDiagnosticsSignHint',
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
411 { texthl = 'LspDiagnosticsSignHint', linehl = '', numhl = '', text = '▎' }
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
412 )
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
413 end
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
414
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
415 vim.lsp.handlers['textDocument/formatting'] = function(err, _, result, _, bufnr)
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
416 if err ~= nil or result == nil then
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
417 return
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
418 end
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
419 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
420 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
421 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
422 -- 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
423 -- 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
424 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
425 end
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
426 end
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
427
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
428 vim.lsp.handlers['textDocument/publishDiagnostics'] = function(...)
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
429 vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { underline = true, update_in_insert = false })(...)
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
430 end
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
431
403
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
432 local capabilities = vim.lsp.protocol.make_client_capabilities()
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
433 capabilities.textDocument.completion.completionItem.snippetSupport = true
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
434 capabilities.textDocument.completion.completionItem.resolveSupport = {
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
435 properties = {
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
436 'documentation',
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
437 'detail',
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
438 'additionalTextEdits',
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
439 },
403
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
440 }
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
441
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
442 lsp.pyright.setup { on_attach = on_attach, capabilities = capabilities }
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
443
404
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
444 null_ls.setup {
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
445 on_attach = on_attach,
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
446 sources = {
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
447 null_ls.builtins.formatting.black,
405
34862cc22221 Add stylua formatting config
zegervdv <zegervdv@me.com>
parents: 404
diff changeset
448 null_ls.builtins.formatting.stylua,
404
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
449 },
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
450 }
332
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
451
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
452 -- 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
453 local ok, localconfig = pcall(require, 'localconfig')
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
454 if ok then
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
455 localconfig.setup { on_attach = on_attach, capabilities = capabilities }
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
456 end