Mercurial > dotfiles
annotate .chezmoitemplates/init.lua @ 741:aef7dab2b0e5
feat: only jump snippets if inside one
| author | zegervdv <zegervdv@me.com> |
|---|---|
| date | Thu, 22 Dec 2022 10:44:01 +0100 |
| parents | 68cb1c4b268c |
| children | 3ebd380b6ce1 |
| rev | line source |
|---|---|
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1 -- |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
2 -- Neovim dotfiles |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
3 -- |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
4 -- |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
5 local execute = vim.api.nvim_command |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
6 local fn = vim.fn |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
7 |
| 582 | 8 local home = os.getenv 'HOME' |
|
600
24b0dd06381b
Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents:
599
diff
changeset
|
9 if home == nil then home = os.getenv 'USERPROFILE' end |
| 579 | 10 |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
11 -- Bootstrap package manager |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
12 local install_path = fn.stdpath 'data' .. '/site/pack/packer/opt/packer.nvim' |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
13 |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
14 if fn.empty(fn.glob(install_path)) > 0 then |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
15 execute('!git clone https://github.com/wbthomason/packer.nvim ' .. install_path) |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
16 end |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
17 |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
18 -- Packer configuration is compiled and only needs to be loaded on changes |
| 613 | 19 vim.cmd.packadd 'packer.nvim' |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
20 |
|
649
cc06db32b946
Source local plugins if available
zegervdv <zegervdv@me.com>
parents:
648
diff
changeset
|
21 local local_plugin = function(name) |
|
cc06db32b946
Source local plugins if available
zegervdv <zegervdv@me.com>
parents:
648
diff
changeset
|
22 local path = home .. '/Projects/' .. name |
|
cc06db32b946
Source local plugins if available
zegervdv <zegervdv@me.com>
parents:
648
diff
changeset
|
23 if vim.fn.isdirectory(path) > 0 then |
|
cc06db32b946
Source local plugins if available
zegervdv <zegervdv@me.com>
parents:
648
diff
changeset
|
24 return path |
|
cc06db32b946
Source local plugins if available
zegervdv <zegervdv@me.com>
parents:
648
diff
changeset
|
25 else |
|
cc06db32b946
Source local plugins if available
zegervdv <zegervdv@me.com>
parents:
648
diff
changeset
|
26 return 'zegervdv/' .. name |
|
cc06db32b946
Source local plugins if available
zegervdv <zegervdv@me.com>
parents:
648
diff
changeset
|
27 end |
|
cc06db32b946
Source local plugins if available
zegervdv <zegervdv@me.com>
parents:
648
diff
changeset
|
28 end |
|
cc06db32b946
Source local plugins if available
zegervdv <zegervdv@me.com>
parents:
648
diff
changeset
|
29 |
| 706 | 30 require('packer').startup { |
|
713
45c34cfecc3e
feat: enable full neodev options in chezmoi folder
zegervdv <zegervdv@me.com>
parents:
706
diff
changeset
|
31 function(use) |
| 706 | 32 use { 'wbthomason/packer.nvim', opt = true } |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
33 |
| 706 | 34 -- General plugins |
| 35 use { 'tpope/vim-sensible' } | |
| 36 use { 'tpope/vim-repeat' } | |
| 37 use { 'tpope/vim-rsi' } | |
| 38 use { 'sgur/vim-editorconfig' } | |
| 39 use { | |
| 40 'ojroques/nvim-osc52', | |
| 41 config = function() | |
| 42 require('osc52').setup { trim = true } | |
| 43 local copy = function(lines, _) require('osc52').copy(table.concat(lines, '\n')) end | |
| 44 local paste = function() return { vim.fn.split(vim.fn.getreg '', '\n'), vim.fn.getregtype '' } end | |
| 45 vim.g.clipboard = { | |
| 46 name = 'osc52', | |
| 47 copy = { ['+'] = copy, ['*'] = copy }, | |
| 48 paste = { ['+'] = paste, ['*'] = paste }, | |
| 49 } | |
| 50 end, | |
| 51 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
52 |
| 706 | 53 use { |
| 54 'tpope/vim-eunuch', | |
| 55 cmd = { | |
| 56 'Delete', | |
| 57 'Unlink', | |
| 58 'Move', | |
| 59 'Rename', | |
| 60 'Mkdir', | |
| 61 'Chmod', | |
| 62 'Cfind', | |
| 63 'Clocate', | |
| 64 'Lfind', | |
| 65 'Llocate', | |
| 66 'SudoEdit', | |
| 67 'SudoWrite', | |
| 68 'Wall', | |
| 69 }, | |
| 70 } | |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
71 |
| 706 | 72 -- Smooth scrolling |
| 73 use { | |
| 74 'karb94/neoscroll.nvim', | |
| 75 config = function() require('neoscroll').setup {} end, | |
| 76 } | |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
77 |
| 706 | 78 -- Faster lua package loading (until 15436 is merged) |
| 79 use { | |
| 80 'lewis6991/impatient.nvim', | |
| 81 module = { 'impatient' }, | |
| 82 setup = function() require 'impatient' end, | |
| 83 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
84 |
| 706 | 85 -- Library with lua functions |
| 86 use { 'nvim-lua/plenary.nvim' } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
87 |
| 706 | 88 -- Spelling/autocorrection |
| 89 use { 'tpope/vim-abolish' } | |
| 482 | 90 |
| 706 | 91 -- Git/VCS |
| 92 use { 'vim-scripts/gitignore' } | |
| 93 use { | |
| 94 'zegervdv/settle.nvim', | |
| 95 opt = true, | |
| 96 cmd = { 'SettleInit' }, | |
| 97 config = function() | |
| 98 require('settle').setup { | |
| 99 wrap = true, | |
| 100 symbol = '▊', | |
| 101 pre_hook = function() | |
| 102 -- disable dirvish | |
| 103 vim.api.nvim_del_keymap('n', '-') | |
| 104 end, | |
| 105 } | |
| 106 end, | |
| 107 } | |
| 108 use { 'tpope/vim-git', ft = { 'gitcommit', 'gitrebase' } } | |
| 109 use { | |
| 110 local_plugin 'diffview.nvim', | |
|
715
28900bda2334
feat: enable 4 way diff in diffview
zegervdv <zegervdv@me.com>
parents:
714
diff
changeset
|
111 config = function() |
|
28900bda2334
feat: enable 4 way diff in diffview
zegervdv <zegervdv@me.com>
parents:
714
diff
changeset
|
112 require('diffview').setup { |
|
28900bda2334
feat: enable 4 way diff in diffview
zegervdv <zegervdv@me.com>
parents:
714
diff
changeset
|
113 use_icons = false, |
|
734
485de5dc7ef2
feat: configure fold/folder icons for diffview
zegervdv <zegervdv@me.com>
parents:
733
diff
changeset
|
114 icons = { |
|
485de5dc7ef2
feat: configure fold/folder icons for diffview
zegervdv <zegervdv@me.com>
parents:
733
diff
changeset
|
115 folder_closed = '+', |
|
485de5dc7ef2
feat: configure fold/folder icons for diffview
zegervdv <zegervdv@me.com>
parents:
733
diff
changeset
|
116 folder_open = '-', |
|
485de5dc7ef2
feat: configure fold/folder icons for diffview
zegervdv <zegervdv@me.com>
parents:
733
diff
changeset
|
117 }, |
|
485de5dc7ef2
feat: configure fold/folder icons for diffview
zegervdv <zegervdv@me.com>
parents:
733
diff
changeset
|
118 signs = { |
|
485de5dc7ef2
feat: configure fold/folder icons for diffview
zegervdv <zegervdv@me.com>
parents:
733
diff
changeset
|
119 fold_closed = '+', |
|
485de5dc7ef2
feat: configure fold/folder icons for diffview
zegervdv <zegervdv@me.com>
parents:
733
diff
changeset
|
120 fold_open = '-', |
|
485de5dc7ef2
feat: configure fold/folder icons for diffview
zegervdv <zegervdv@me.com>
parents:
733
diff
changeset
|
121 done = '✓', |
|
485de5dc7ef2
feat: configure fold/folder icons for diffview
zegervdv <zegervdv@me.com>
parents:
733
diff
changeset
|
122 }, |
|
733
1a7ec1a0d2a6
feat: enable chg binary for diffview
zegervdv <zegervdv@me.com>
parents:
732
diff
changeset
|
123 hg_cmd = { 'chg' }, |
|
715
28900bda2334
feat: enable 4 way diff in diffview
zegervdv <zegervdv@me.com>
parents:
714
diff
changeset
|
124 view = { |
|
28900bda2334
feat: enable 4 way diff in diffview
zegervdv <zegervdv@me.com>
parents:
714
diff
changeset
|
125 merge_tool = { |
|
28900bda2334
feat: enable 4 way diff in diffview
zegervdv <zegervdv@me.com>
parents:
714
diff
changeset
|
126 layout = 'diff4_mixed', |
|
28900bda2334
feat: enable 4 way diff in diffview
zegervdv <zegervdv@me.com>
parents:
714
diff
changeset
|
127 }, |
|
28900bda2334
feat: enable 4 way diff in diffview
zegervdv <zegervdv@me.com>
parents:
714
diff
changeset
|
128 }, |
|
28900bda2334
feat: enable 4 way diff in diffview
zegervdv <zegervdv@me.com>
parents:
714
diff
changeset
|
129 } |
|
731
08beb03b4ee5
feat: add which-key menu for some diffview commands
zegervdv <zegervdv@me.com>
parents:
730
diff
changeset
|
130 local wk = require 'which-key' |
|
08beb03b4ee5
feat: add which-key menu for some diffview commands
zegervdv <zegervdv@me.com>
parents:
730
diff
changeset
|
131 wk.register { ['<leader>d'] = { name = 'Diffview' } } |
|
08beb03b4ee5
feat: add which-key menu for some diffview commands
zegervdv <zegervdv@me.com>
parents:
730
diff
changeset
|
132 vim.keymap.set('n', '<leader>do', '<cmd>DiffviewOpen<CR>', { desc = 'Open Diffview' }) |
|
08beb03b4ee5
feat: add which-key menu for some diffview commands
zegervdv <zegervdv@me.com>
parents:
730
diff
changeset
|
133 vim.keymap.set('n', '<leader>df', '<cmd>DiffviewFileHistory %<CR>', { desc = 'Show history for current file' }) |
|
734
485de5dc7ef2
feat: configure fold/folder icons for diffview
zegervdv <zegervdv@me.com>
parents:
733
diff
changeset
|
134 vim.keymap.set('n', '<leader>dh', ':DiffviewFileHistory ', { desc = 'Show history' }) |
|
731
08beb03b4ee5
feat: add which-key menu for some diffview commands
zegervdv <zegervdv@me.com>
parents:
730
diff
changeset
|
135 vim.keymap.set('n', '<leader>dc', '<cmd>DiffviewClose<CR>', { desc = 'Close Diffview window' }) |
|
715
28900bda2334
feat: enable 4 way diff in diffview
zegervdv <zegervdv@me.com>
parents:
714
diff
changeset
|
136 end, |
| 706 | 137 } |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
138 |
| 706 | 139 -- Comments |
| 140 use { | |
| 141 'numToStr/Comment.nvim', | |
| 142 config = function() | |
| 143 local ft = require 'Comment.ft' | |
| 144 ft.systemverilog = { '//%s', '/*%s*/' } | |
| 145 ft.verilog = { '//%s', '/*%s*/' } | |
|
497
852acbe7ae8e
Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents:
496
diff
changeset
|
146 |
| 706 | 147 require('Comment').setup { |
| 148 padding = true, | |
| 149 sticky = true, | |
| 150 ignore = '^(%s*)$', | |
| 151 mappings = { | |
| 152 basic = true, | |
| 153 extra = true, | |
| 154 }, | |
| 155 } | |
| 156 end, | |
| 157 keys = { | |
|
740
68cb1c4b268c
feat: add descriptions for keymaps
zegervdv <zegervdv@me.com>
parents:
739
diff
changeset
|
158 { 'n', 'gc', 'Comment toggle' }, |
|
68cb1c4b268c
feat: add descriptions for keymaps
zegervdv <zegervdv@me.com>
parents:
739
diff
changeset
|
159 { 'n', 'gb', 'Comment Block toggle' }, |
|
68cb1c4b268c
feat: add descriptions for keymaps
zegervdv <zegervdv@me.com>
parents:
739
diff
changeset
|
160 { 'v', 'gc', 'Comment toggle' }, |
|
68cb1c4b268c
feat: add descriptions for keymaps
zegervdv <zegervdv@me.com>
parents:
739
diff
changeset
|
161 { 'v', 'gb', 'Comment block toggle' }, |
| 706 | 162 }, |
| 163 } | |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
164 |
| 706 | 165 -- Parentheses etc |
| 166 use { 'kylechui/nvim-surround', config = function() require('nvim-surround').setup() end } | |
| 167 use { | |
| 168 'windwp/nvim-autopairs', | |
| 169 config = function() | |
| 170 local npairs = require 'nvim-autopairs' | |
| 171 local Rule = require 'nvim-autopairs.rule' | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
172 |
| 706 | 173 local cmp = require 'nvim-autopairs.completion.cmp' |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
174 |
| 706 | 175 require('cmp').event:on('confirm_done', cmp.on_confirm_done()) |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
176 |
| 706 | 177 npairs.setup { |
| 178 ignored_next_char = string.gsub([[ [%w%%%'%[%.] ]], '%s+', ''), | |
| 179 enable_afterquote = false, | |
| 180 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
181 |
| 706 | 182 npairs.add_rules { |
| 183 Rule(' ', ' '):with_pair(function(opts) | |
| 184 local pair = opts.line:sub(opts.col - 1, opts.col) | |
| 185 return vim.tbl_contains({ '()', '[]', '{}' }, pair) | |
| 186 end), | |
| 187 Rule('( ', ' )') | |
| 188 :with_pair(function() return false end) | |
| 189 :with_move(function(opts) return opts.prev_char:match '.%)' ~= nil end) | |
| 190 :use_key ')', | |
| 191 Rule('{ ', ' }') | |
| 192 :with_pair(function() return false end) | |
| 193 :with_move(function(opts) return opts.prev_char:match '.%}' ~= nil end) | |
| 194 :use_key '}', | |
| 195 Rule('[ ', ' ]') | |
| 196 :with_pair(function() return false end) | |
| 197 :with_move(function(opts) return opts.prev_char:match '.%]' ~= nil end) | |
| 198 :use_key ']', | |
| 199 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
200 |
| 706 | 201 npairs.get_rule('`'):with_pair(function() return vim.bo.filetype ~= 'systemverilog' end) |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
202 |
| 706 | 203 npairs.get_rule("'")[1]:with_pair(function() return vim.bo.filetype ~= 'systemverilog' end) |
| 204 end, | |
| 205 after = { 'nvim-cmp' }, | |
| 206 } | |
| 207 | |
| 208 -- Moving around within lines | |
| 209 use { 'wellle/targets.vim', event = 'InsertEnter *' } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
210 |
| 706 | 211 -- Searching |
| 212 use { | |
| 213 'mhinz/vim-grepper', | |
| 214 cmd = { 'Grepper', 'Ag' }, | |
| 215 keys = { { 'n', 'gs' }, { 'x', 'gs' } }, | |
| 216 config = function() | |
| 217 vim.g.grepper = { | |
| 218 tools = { 'ag', 'hg' }, | |
| 219 highlight = 1, | |
| 220 ag = { | |
| 221 grepprg = 'rg --vimgrep', | |
| 222 }, | |
| 223 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
224 |
| 706 | 225 vim.keymap.set({ 'x', 'n' }, 'gs', '<plug>(GrepperOperator)') |
| 226 vim.api.nvim_create_user_command( | |
| 227 'Ag', | |
| 228 'Grepper -noprompt -tool ag -grepprg rg --vimgrep <args>', | |
| 229 { complete = 'file', nargs = '*' } | |
| 230 ) | |
| 231 end, | |
| 232 } | |
| 233 | |
| 234 -- Opening files | |
| 235 use { 'wsdjeg/vim-fetch' } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
236 |
| 706 | 237 -- session management |
| 238 use { | |
| 239 'folke/persistence.nvim', | |
| 240 event = 'BufReadPre', | |
| 241 module = 'persistence', | |
| 242 config = function() require('persistence').setup() end, | |
| 243 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
244 |
| 706 | 245 -- Indent lines |
| 246 use { | |
| 247 'lukas-reineke/indent-blankline.nvim', | |
| 248 config = function() | |
| 249 vim.g.indent_blankline_buftype_exclude = { 'terminal', 'help', 'nofile' } | |
| 250 vim.g.indent_blankline_show_first_indent_level = false | |
| 251 vim.g.indent_blankline_char = '│' | |
| 252 end, | |
| 253 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
254 |
| 706 | 255 -- Increment/decrement |
| 256 use { | |
| 257 'zegervdv/nrpattern.nvim', | |
| 258 branch = 'lua', | |
| 259 requires = 'tpope/vim-repeat', | |
| 260 config = function() | |
| 261 local nrpattern = require 'nrpattern' | |
| 262 local defaults = require 'nrpattern.default' | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
263 |
| 706 | 264 defaults[{ 'input', 'output' }] = { priority = 12, filetypes = { 'verilog', 'systemverilog' } } |
| 265 defaults[{ "'1", "'0" }] = { priority = 9, filetypes = { 'verilog', 'systemverilog' } } | |
| 266 | |
| 267 nrpattern.setup(defaults) | |
| 268 end, | |
| 269 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
270 |
| 706 | 271 -- Tmux |
| 272 use { | |
| 273 'numtostr/navigator.nvim', | |
| 274 config = function() | |
| 275 require('Navigator').setup { auto_save = 'current', disable_on_zoom = true } | |
|
632
ca2687d578d2
Add which-key for lesser used keymaps
zegervdv <zegervdv@me.com>
parents:
631
diff
changeset
|
276 |
| 706 | 277 local nmap = function(lhs, rhs, opts) return vim.keymap.set('n', lhs, rhs, opts) end |
| 278 nmap('<c-h>', require('Navigator').left, { silent = true }) | |
| 279 nmap('<c-j>', require('Navigator').down, { silent = true }) | |
| 280 nmap('<c-k>', require('Navigator').up, { silent = true }) | |
| 281 nmap('<c-l>', require('Navigator').right, { silent = true }) | |
| 282 end, | |
| 283 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
284 |
| 706 | 285 -- Keymap help |
| 286 use { | |
| 287 'folke/which-key.nvim', | |
| 288 config = function() | |
| 289 require('which-key').setup { | |
|
735
972d55bec218
feat: enable spelling suggestions in which-key
zegervdv <zegervdv@me.com>
parents:
734
diff
changeset
|
290 plugins = { |
|
972d55bec218
feat: enable spelling suggestions in which-key
zegervdv <zegervdv@me.com>
parents:
734
diff
changeset
|
291 spelling = { |
|
972d55bec218
feat: enable spelling suggestions in which-key
zegervdv <zegervdv@me.com>
parents:
734
diff
changeset
|
292 enabled = true, |
|
972d55bec218
feat: enable spelling suggestions in which-key
zegervdv <zegervdv@me.com>
parents:
734
diff
changeset
|
293 suggestions = 20, |
|
972d55bec218
feat: enable spelling suggestions in which-key
zegervdv <zegervdv@me.com>
parents:
734
diff
changeset
|
294 }, |
|
972d55bec218
feat: enable spelling suggestions in which-key
zegervdv <zegervdv@me.com>
parents:
734
diff
changeset
|
295 }, |
|
972d55bec218
feat: enable spelling suggestions in which-key
zegervdv <zegervdv@me.com>
parents:
734
diff
changeset
|
296 triggers = { '<leader>', 'g', '<c-w>', '"', '`', 'z' }, |
| 706 | 297 } |
| 298 end, | |
| 299 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
300 |
| 706 | 301 -- Completion/snippets/LSP |
| 302 use { 'neovim/nvim-lspconfig' } | |
| 303 use { | |
| 304 'hrsh7th/nvim-cmp', | |
| 305 requires = { | |
| 306 'hrsh7th/cmp-buffer', | |
| 307 'hrsh7th/cmp-nvim-lsp', | |
| 308 'saadparwaiz1/cmp_luasnip', | |
| 309 'hrsh7th/cmp-path', | |
| 310 'hrsh7th/cmp-cmdline', | |
| 311 'hrsh7th/cmp-nvim-lsp-signature-help', | |
| 312 }, | |
| 313 config = function() | |
| 314 local cmp = require 'cmp' | |
| 315 local luasnip = require 'luasnip' | |
| 316 | |
| 317 local has_words_before = function() | |
| 318 local line, col = unpack(vim.api.nvim_win_get_cursor(0)) | |
| 319 return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match '%s' == nil | |
| 320 end | |
|
518
784b931c51b7
Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents:
517
diff
changeset
|
321 |
| 706 | 322 cmp.setup { |
| 323 snippet = { | |
| 324 expand = function(args) luasnip.lsp_expand(args.body) end, | |
| 325 }, | |
| 326 mapping = { | |
| 327 ['<C-p>'] = { i = cmp.mapping.select_prev_item() }, | |
| 328 ['<C-n>'] = { i = cmp.mapping.select_next_item() }, | |
| 329 ['<C-d>'] = { i = cmp.mapping.scroll_docs(-4) }, | |
| 330 ['<C-y>'] = { i = cmp.mapping.complete() }, | |
| 331 ['<C-e>'] = { i = cmp.mapping.close() }, | |
| 332 ['<CR>'] = { i = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace } }, | |
| 333 ['<C-k>'] = { i = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace } }, | |
| 334 }, | |
| 335 sources = { | |
| 336 { name = 'nvim_lsp' }, | |
| 337 { name = 'nvim_lsp_signature_help' }, | |
| 338 { name = 'buffer', keyword_length = 5 }, | |
| 339 { name = 'luasnip' }, | |
| 340 { name = 'path' }, | |
| 341 }, | |
| 342 experimental = { | |
| 343 native_menu = false, | |
| 344 ghost_text = true, | |
| 345 }, | |
| 346 } | |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
347 |
| 706 | 348 cmp.setup.cmdline(':', { |
| 349 mapping = cmp.mapping.preset.cmdline { | |
| 350 ['<C-p>'] = { c = cmp.mapping.select_prev_item() }, | |
| 351 ['<C-n>'] = { c = cmp.mapping.select_next_item() }, | |
| 352 ['<C-y>'] = { c = cmp.mapping.complete() }, | |
|
496
8524c1a304a6
Enable tree-sitter highlights for systemverilog
zegervdv <zegervdv@me.com>
parents:
495
diff
changeset
|
353 }, |
| 706 | 354 sources = cmp.config.sources({ |
| 355 { name = 'path' }, | |
| 356 }, { | |
| 357 { name = 'cmdline', keyword_length = 4 }, | |
| 358 }), | |
| 359 }) | |
| 360 end, | |
| 361 after = 'luasnip', | |
| 362 } | |
| 363 use { | |
| 364 { | |
| 365 'nvim-treesitter/nvim-treesitter', | |
| 366 run = ':TSUpdate', | |
| 367 config = function() | |
| 368 require 'nvim-treesitter.highlight' | |
| 369 | |
| 370 require('nvim-treesitter.configs').setup { | |
| 371 ensure_installed = { | |
| 372 'python', | |
| 373 'lua', | |
| 374 'verilog', | |
| 375 'json', | |
| 376 'yaml', | |
| 377 'bash', | |
| 378 'dockerfile', | |
| 379 'c', | |
| 380 'cpp', | |
| 381 'regex', | |
| 382 'markdown', | |
| 383 'rst', | |
| 384 'beancount', | |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
385 }, |
| 706 | 386 indent = { |
| 387 enable = false, | |
| 388 }, | |
| 389 highlight = { | |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
390 enable = true, |
| 706 | 391 disable = { 'systemverilog', 'verilog' }, |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
392 }, |
| 706 | 393 incremental_selection = { |
|
500
c6624d04906a
Add treesitter based textobjects
zegervdv <zegervdv@me.com>
parents:
499
diff
changeset
|
394 enable = true, |
|
c6624d04906a
Add treesitter based textobjects
zegervdv <zegervdv@me.com>
parents:
499
diff
changeset
|
395 keymaps = { |
| 706 | 396 init_selection = 'gnn', |
| 397 node_incremental = 'grn', | |
| 398 scope_incremental = 'grc', | |
| 399 node_decremental = 'grm', | |
|
500
c6624d04906a
Add treesitter based textobjects
zegervdv <zegervdv@me.com>
parents:
499
diff
changeset
|
400 }, |
|
c6624d04906a
Add treesitter based textobjects
zegervdv <zegervdv@me.com>
parents:
499
diff
changeset
|
401 }, |
| 706 | 402 refactor = { |
| 403 highlight_definitions = { enable = true }, | |
| 404 smart_rename = { enable = true, keymaps = { smart_rename = 'gsr' } }, | |
| 405 navigation = { | |
| 406 enable = true, | |
| 407 keymaps = { goto_definition = 'gnd', list_definitions = 'gnD' }, | |
| 408 }, | |
| 409 }, | |
| 410 textobjects = { | |
| 411 move = { | |
| 412 enable = true, | |
| 413 goto_next_start = { [']]'] = '@block.outer' }, | |
| 414 goto_previous_start = { ['[['] = '@block.outer' }, | |
| 415 goto_next_end = { [']['] = '@block.outer' }, | |
| 416 goto_previous_end = { ['[]'] = '@block.outer' }, | |
| 417 }, | |
| 418 select = { | |
| 419 enable = true, | |
| 420 lookahead = true, | |
| 421 keymaps = { | |
| 422 ['af'] = '@function.outer', | |
| 423 ['if'] = '@function.inner', | |
|
728
b9c330fc7a79
feat: add treesitter block object
zegervdv <zegervdv@me.com>
parents:
727
diff
changeset
|
424 ['ab'] = '@block.outer', |
|
b9c330fc7a79
feat: add treesitter block object
zegervdv <zegervdv@me.com>
parents:
727
diff
changeset
|
425 ['ib'] = '@block.inner', |
| 706 | 426 }, |
| 427 }, | |
| 428 }, | |
| 429 playground = { enable = true, disable = {}, updatetime = 25, persist_queries = false }, | |
| 430 } | |
| 431 end, | |
| 432 }, | |
| 433 'nvim-treesitter/nvim-treesitter-refactor', | |
| 434 'nvim-treesitter/nvim-treesitter-textobjects', | |
| 435 { 'nvim-treesitter/playground', opt = true }, | |
| 436 } | |
| 437 use { 'L3MON4D3/luasnip' } | |
| 438 use { | |
| 439 'rmagatti/goto-preview', | |
| 440 config = function() require('goto-preview').setup {} end, | |
| 441 } | |
| 442 use { | |
| 443 'jose-elias-alvarez/null-ls.nvim', | |
| 444 requires = 'nvim-lua/plenary.nvim', | |
| 445 } | |
| 446 use { 'folke/neodev.nvim' } | |
| 447 use { | |
| 448 'smjonas/inc-rename.nvim', | |
| 449 config = function() | |
| 450 require('inc_rename').setup { | |
| 451 post_hook = function(result) | |
| 452 local changed = {} | |
| 453 for uri, changes in pairs(result.changes or result.documentChanges) do | |
| 454 local bufnr = vim.uri_to_bufnr(uri) | |
| 455 for _, edits in ipairs(changes) do | |
| 456 table.insert(changed, { | |
| 457 bufnr = bufnr, | |
| 458 lnum = edits.range.start.line + 1, | |
| 459 col = edits.range.start.character + 1, | |
| 460 text = vim.api.nvim_buf_get_lines(bufnr, edits.range.start.line, edits.range.start.line + 1, false)[1], | |
| 461 }) | |
| 462 end | |
| 463 end | |
| 464 vim.fn.setqflist(changed, 'r') | |
| 465 end, | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
466 } |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
467 end, |
| 706 | 468 } |
| 469 use { | |
|
718
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
470 local_plugin 'lsp-format-modifications.nvim', |
|
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
471 requires = { 'nvim-lua/plenary.nvim' }, |
|
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
472 } |
|
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
473 use { |
|
720
6d036fac4dbd
feat: use notifier for messages and lsp progress
zegervdv <zegervdv@me.com>
parents:
719
diff
changeset
|
474 'vigoux/notifier.nvim', |
|
6d036fac4dbd
feat: use notifier for messages and lsp progress
zegervdv <zegervdv@me.com>
parents:
719
diff
changeset
|
475 config = function() require('notifier').setup { status_width = 70 } end, |
| 706 | 476 } |
| 477 use { | |
| 478 'https://git.sr.ht/~whynothugo/lsp_lines.nvim', | |
| 479 disable = true, | |
| 480 config = function() | |
| 481 require('lsp_lines').setup() | |
| 482 vim.diagnostic.config { virtual_lines = false, virtual_text = false } | |
| 483 vim.keymap.set( | |
| 484 'n', | |
| 485 'g?', | |
| 486 function() require('lsp_lines').toggle() end, | |
| 487 { desc = 'Toggle LSP diagnostic lines' } | |
| 488 ) | |
| 489 end, | |
| 490 } | |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
491 |
| 706 | 492 use { |
| 739 | 493 'ThePrimeagen/refactoring.nvim', |
| 494 after = 'which-key.nvim', | |
| 495 requires = { | |
| 496 'nvim-lua/plenary.nvim', | |
| 497 'nvim-treesitter/nvim-treesitter', | |
| 498 }, | |
| 499 config = function() | |
| 500 local refactoring = require 'refactoring' | |
| 501 local wk = require 'which-key' | |
| 502 | |
| 503 refactoring.setup {} | |
| 504 | |
| 505 wk.register { ['<leader>r'] = { name = 'Refactoring' } } | |
| 506 | |
| 507 local maps = { | |
| 508 { mode = 'v', key = 'e', name = 'Extract Function' }, | |
| 509 { mode = 'v', key = 'f', name = 'Extract Function To File' }, | |
| 510 { mode = 'v', key = 'v', name = 'Extract Variable' }, | |
| 511 { mode = 'v', key = 'i', name = 'Inline Variable' }, | |
| 512 { mode = 'n', key = 'b', name = 'Extract Block' }, | |
| 513 { mode = 'n', key = 'bf', name = 'Extract Block To File' }, | |
| 514 { mode = 'n', key = 'i', name = 'Inline Variable' }, | |
| 515 } | |
| 516 for _, map in ipairs(maps) do | |
| 517 vim.keymap.set( | |
| 518 map.mode, | |
| 519 '<leader>r' .. map.key, | |
| 520 function() refactoring.refactor(map.name) end, | |
| 521 { desc = map.name, silent = true, expr = false } | |
| 522 ) | |
| 523 end | |
| 524 vim.keymap.set( | |
| 525 'n', | |
| 526 '<leader>rpp', | |
| 527 function() refactoring.debug.printf { below = false } end, | |
| 528 { desc = 'Add debug print statement', silent = true } | |
| 529 ) | |
| 530 vim.keymap.set( | |
| 531 'n', | |
| 532 '<leader>rpv', | |
| 533 function() refactoring.debug.print_var { normal = true } end, | |
| 534 { desc = 'Print variable', silent = true } | |
| 535 ) | |
| 536 vim.keymap.set( | |
| 537 'v', | |
| 538 '<leader>rpv', | |
| 539 function() refactoring.debug.print_var() end, | |
| 540 { desc = 'Print variable', silent = true } | |
| 541 ) | |
| 542 vim.keymap.set( | |
| 543 'n', | |
| 544 '<leader>rpc', | |
| 545 function() refactoring.debug.cleanup {} end, | |
| 546 { desc = 'Clean up debug prints', silent = true } | |
| 547 ) | |
| 548 end, | |
| 549 } | |
| 550 | |
| 551 use { | |
| 706 | 552 'nvim-telescope/telescope-ui-select.nvim', |
| 553 requires = { 'nvim-telescope/telescope.nvim' }, | |
| 554 config = function() | |
| 555 require('telescope').setup { | |
| 556 defaults = { | |
| 620 | 557 border = {}, |
| 558 borderchars = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' }, | |
| 559 winblend = 0, | |
| 560 }, | |
| 706 | 561 extensions = { |
| 562 ['ui-select'] = require('telescope.themes').get_dropdown { | |
| 563 border = {}, | |
| 564 borderchars = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' }, | |
| 565 winblend = 0, | |
| 566 }, | |
| 567 }, | |
| 568 } | |
| 569 require('telescope').load_extension 'ui-select' | |
| 570 end, | |
| 571 } | |
| 620 | 572 |
| 706 | 573 use { 'vimjas/vim-python-pep8-indent', ft = { 'python' } } |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
574 |
| 706 | 575 use { |
| 576 'rebelot/heirline.nvim', | |
|
716
787e0516daa5
feat: add darkmode settings for heirline
zegervdv <zegervdv@me.com>
parents:
715
diff
changeset
|
577 after = { 'espresso-tutti-colori.nvim', 'catppuccin' }, |
| 706 | 578 config = function() |
| 579 local utils = require 'heirline.utils' | |
| 580 local conditions = require 'heirline.conditions' | |
| 581 | |
|
716
787e0516daa5
feat: add darkmode settings for heirline
zegervdv <zegervdv@me.com>
parents:
715
diff
changeset
|
582 local colors |
|
787e0516daa5
feat: add darkmode settings for heirline
zegervdv <zegervdv@me.com>
parents:
715
diff
changeset
|
583 if os.getenv 'DARKMODE' then |
|
787e0516daa5
feat: add darkmode settings for heirline
zegervdv <zegervdv@me.com>
parents:
715
diff
changeset
|
584 colors = require('catppuccin.palettes').get_palette 'mocha' |
|
787e0516daa5
feat: add darkmode settings for heirline
zegervdv <zegervdv@me.com>
parents:
715
diff
changeset
|
585 else |
|
787e0516daa5
feat: add darkmode settings for heirline
zegervdv <zegervdv@me.com>
parents:
715
diff
changeset
|
586 colors = require('tutti-colori.colors').setup() |
|
787e0516daa5
feat: add darkmode settings for heirline
zegervdv <zegervdv@me.com>
parents:
715
diff
changeset
|
587 end |
| 706 | 588 colors.diag_warn = utils.get_highlight('DiagnosticSignWarn').fg |
| 589 colors.diag_error = utils.get_highlight('DiagnosticSignError').fg | |
|
605
2828b29de182
switch to heirline as status line
zegervdv <zegervdv@me.com>
parents:
604
diff
changeset
|
590 |
| 706 | 591 require('heirline').load_colors(colors) |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
592 |
| 706 | 593 local align = { provider = '%=' } |
| 594 local space = { provider = ' ' } | |
| 595 local lbound = { provider = '▊ ', hl = { fg = 'blue', bg = 'bg' } } | |
| 596 local rbound = { provider = ' ▊', hl = { fg = 'blue', bg = 'bg' } } | |
| 597 | |
| 598 local FileNameBlock = { | |
| 599 init = function(self) self.filename = vim.api.nvim_buf_get_name(0) end, | |
| 600 } | |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
601 |
| 706 | 602 local FileName = { |
| 603 provider = function(self) | |
| 604 local filename = vim.fn.fnamemodify(self.filename, ':.') | |
| 605 if filename == '' then return '[No Name]' end | |
|
605
2828b29de182
switch to heirline as status line
zegervdv <zegervdv@me.com>
parents:
604
diff
changeset
|
606 |
| 706 | 607 if not conditions.width_percent_below(#filename, 0.25) then filename = vim.fn.pathshorten(filename) end |
| 608 | |
| 609 return filename | |
| 610 end, | |
| 611 hl = { fg = 'blue' }, | |
| 612 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
613 |
| 706 | 614 local FileFlags = { |
| 615 { | |
| 616 provider = function() | |
| 617 if vim.bo.modified then return ' [+]' end | |
| 618 end, | |
| 619 hl = { fg = 'green' }, | |
| 620 }, | |
| 621 { | |
| 622 provider = function() | |
| 623 if not vim.bo.modifiable or vim.bo.readonly then return ' RO' end | |
| 624 end, | |
| 625 hl = { fg = 'orange' }, | |
| 626 }, | |
| 627 } | |
| 609 | 628 |
| 706 | 629 FileNameBlock = utils.insert(FileNameBlock, FileName, unpack(FileFlags), { provider = '%<' }) |
| 630 | |
| 631 local Ruler = { provider = '%l : %c %P' } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
632 |
| 706 | 633 local Lsp = { |
| 634 condition = conditions.lsp_attached, | |
| 635 update = { 'LspAttach', 'LspDetach' }, | |
|
605
2828b29de182
switch to heirline as status line
zegervdv <zegervdv@me.com>
parents:
604
diff
changeset
|
636 provider = function() |
| 706 | 637 local names = {} |
| 638 for _, server in pairs(vim.lsp.get_active_clients { bufnr = 0 }) do | |
| 639 table.insert(names, server.name) | |
| 640 end | |
| 641 return table.concat(names, ', ') | |
|
487
0252f9494d64
Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents:
486
diff
changeset
|
642 end, |
|
605
2828b29de182
switch to heirline as status line
zegervdv <zegervdv@me.com>
parents:
604
diff
changeset
|
643 hl = { fg = 'green' }, |
| 706 | 644 } |
|
605
2828b29de182
switch to heirline as status line
zegervdv <zegervdv@me.com>
parents:
604
diff
changeset
|
645 |
| 706 | 646 local Diagnostics = { |
| 647 condition = conditions.has_diagnostics, | |
| 648 init = function(self) | |
| 649 self.errors = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.ERROR }) | |
| 650 self.warnings = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.WARN }) | |
| 651 end, | |
| 652 update = { 'DiagnosticChanged', 'BufEnter' }, | |
| 653 { | |
| 654 provider = function(self) return self.errors > 0 and self.errors .. ' ' end, | |
| 655 hl = { fg = 'diag_error' }, | |
| 656 }, | |
| 657 { | |
| 658 provider = function(self) return self.warnings > 0 and self.warnings .. ' ' end, | |
| 659 }, | |
| 660 hl = { fg = 'diag_warn' }, | |
| 661 on_click = { | |
| 662 callback = function() | |
| 663 local diagnostics = vim.diagnostic.get(0, { severity = { min = vim.diagnostic.severity.WARN } }) | |
| 664 vim.fn.setqflist(vim.diagnostic.toqflist(diagnostics)) | |
| 665 vim.cmd.copen { mods = { split = 'botright' } } | |
| 666 end, | |
| 667 name = 'heirline_diagnostics', | |
| 668 }, | |
| 669 } | |
|
605
2828b29de182
switch to heirline as status line
zegervdv <zegervdv@me.com>
parents:
604
diff
changeset
|
670 |
|
725
624d8036f5ae
feat: add window number to inactive window and a mapping to select it
zegervdv <zegervdv@me.com>
parents:
724
diff
changeset
|
671 local Window = { |
|
624d8036f5ae
feat: add window number to inactive window and a mapping to select it
zegervdv <zegervdv@me.com>
parents:
724
diff
changeset
|
672 provider = function() return '- ' .. vim.api.nvim_win_get_number(0) .. ' -' end, |
|
624d8036f5ae
feat: add window number to inactive window and a mapping to select it
zegervdv <zegervdv@me.com>
parents:
724
diff
changeset
|
673 hl = { fg = 'blue' }, |
|
624d8036f5ae
feat: add window number to inactive window and a mapping to select it
zegervdv <zegervdv@me.com>
parents:
724
diff
changeset
|
674 } |
|
624d8036f5ae
feat: add window number to inactive window and a mapping to select it
zegervdv <zegervdv@me.com>
parents:
724
diff
changeset
|
675 |
| 706 | 676 local statusline_default = { lbound, FileNameBlock, align, Diagnostics, Lsp, space, Ruler, rbound } |
| 677 local statusline_inactive = { | |
| 678 condition = function() return not conditions.is_active() end, | |
| 679 lbound, | |
| 680 FileNameBlock, | |
| 681 align, | |
|
725
624d8036f5ae
feat: add window number to inactive window and a mapping to select it
zegervdv <zegervdv@me.com>
parents:
724
diff
changeset
|
682 Window, |
| 706 | 683 rbound, |
| 684 } | |
| 685 local statusline = { | |
| 686 fallthrough = false, | |
| 687 hl = { bg = 'bg' }, | |
| 688 statusline_inactive, | |
| 689 statusline_default, | |
| 690 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
691 |
| 706 | 692 require('heirline').setup(statusline) |
| 693 end, | |
| 694 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
695 |
| 706 | 696 -- File navigation |
| 697 use { | |
| 698 'elihunter173/dirbuf.nvim', | |
| 699 opt = true, | |
| 700 config = function() | |
| 701 require('dirbuf').setup { | |
| 702 hash_padding = 2, | |
| 703 show_hidden = true, | |
| 704 } | |
| 705 end, | |
| 706 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
707 |
| 706 | 708 -- Colorscheme |
| 709 use { | |
| 710 local_plugin 'espresso-tutti-colori.nvim', | |
|
737
179f83e1a479
fix: correct colorscheme setting
zegervdv <zegervdv@me.com>
parents:
735
diff
changeset
|
711 disable = os.getenv 'DARKMODE', |
|
179f83e1a479
fix: correct colorscheme setting
zegervdv <zegervdv@me.com>
parents:
735
diff
changeset
|
712 config = function() |
|
179f83e1a479
fix: correct colorscheme setting
zegervdv <zegervdv@me.com>
parents:
735
diff
changeset
|
713 require('tutti-colori').setup() |
|
179f83e1a479
fix: correct colorscheme setting
zegervdv <zegervdv@me.com>
parents:
735
diff
changeset
|
714 require('tutti-colori').load() |
|
179f83e1a479
fix: correct colorscheme setting
zegervdv <zegervdv@me.com>
parents:
735
diff
changeset
|
715 end, |
| 714 | 716 } |
| 717 use { | |
| 718 'catppuccin/nvim', | |
| 719 as = 'catppuccin', | |
| 706 | 720 config = function() |
| 714 | 721 require('catppuccin').setup { |
| 722 flavour = 'mocha', | |
| 723 } | |
| 706 | 724 end, |
| 725 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
726 |
| 706 | 727 -- Terminal |
| 728 use { | |
| 729 'akinsho/nvim-toggleterm.lua', | |
| 730 config = function() | |
| 731 require('toggleterm').setup { | |
| 732 size = 15, | |
| 733 open_mapping = [[<F12>]], | |
| 734 shade_filetypes = { 'none' }, | |
| 735 shade_terminals = true, | |
| 736 persist_size = true, | |
| 737 direction = 'horizontal', | |
| 738 } | |
| 739 end, | |
| 740 keys = { [[<F12>]] }, | |
| 741 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
742 |
| 706 | 743 -- Integration with external tools |
| 744 use { | |
| 745 'glacambre/firenvim', | |
| 746 run = function() vim.fn['firenvim#install'](0) end, | |
| 747 config = function() | |
| 748 vim.g.firenvim_config = { | |
| 749 localSettings = { | |
| 750 ['.*'] = { | |
| 751 takeover = 'never', | |
| 752 }, | |
| 582 | 753 }, |
| 706 | 754 } |
| 755 end, | |
| 756 } | |
| 757 end, | |
| 758 config = { snapshot_path = vim.fn.stdpath 'config' }, | |
| 759 } | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
760 |
| 613 | 761 vim.cmd.packadd 'dirbuf.nvim' |
|
519
d919c1590230
Move dirvish loading to init.lua
zegervdv <zegervdv@me.com>
parents:
518
diff
changeset
|
762 |
| 714 | 763 if os.getenv 'DARKMODE' then |
| 764 vim.cmd.colorscheme 'catppuccin' | |
| 765 else | |
|
737
179f83e1a479
fix: correct colorscheme setting
zegervdv <zegervdv@me.com>
parents:
735
diff
changeset
|
766 require('tutti-colori').setup() |
| 714 | 767 vim.cmd.colorscheme 'espresso-tutti-colori' |
| 768 end | |
| 769 | |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
770 -- Configuration |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
771 vim.opt.backspace = { 'indent', 'eol', 'start' } -- Backspace everything |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
772 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
773 vim.opt.autoread = true -- Read changed files |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
774 vim.opt.hidden = true -- Allow to move away from modified files |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
775 vim.opt.autowriteall = true -- Write changes when losing focus |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
776 |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
777 -- Visuals |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
778 vim.opt.number = true |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
779 vim.opt.relativenumber = true |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
780 vim.opt.scrolloff = 4 |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
781 vim.opt.showcmd = true -- Show incomplete commands while typing |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
782 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
783 vim.opt.termguicolors = true |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
784 vim.opt.background = 'dark' |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
785 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
786 vim.opt.showmatch = true -- Highligh matching braces |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
787 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
788 vim.opt.wrap = true -- Wrap lines |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
789 vim.opt.wrapmargin = 2 -- Stay 2 chars from side |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
790 vim.opt.textwidth = 79 |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
791 vim.opt.colorcolumn = '81' -- Show indication of 81 chars |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
792 vim.opt.linebreak = true -- Smarter wrapping |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
793 vim.opt.breakindent = true -- Indent wrapped lines to same level |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
794 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
795 vim.opt.fixendofline = true -- Add EOL when missing |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
796 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
797 vim.opt.expandtab = true -- Add spaces when pressing tab |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
798 vim.opt.tabstop = 2 -- Tab is 2 spaces |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
799 vim.opt.shiftwidth = 2 -- Shift per 2 spaces |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
800 vim.opt.shiftround = true -- Round shifts to allign (1 space + tab = 2 spaces) |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
801 |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
802 -- Searching and substitute |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
803 vim.opt.magic = true -- Enable regexes |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
804 vim.opt.hlsearch = true -- Highlight all matches |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
805 vim.opt.incsearch = true -- Show matches while typing |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
806 vim.opt.ignorecase = true |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
807 vim.opt.smartcase = true -- When search pattern contains cases, be case sensitive |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
808 vim.opt.gdefault = true -- Use global flag for substitute: replace all matches on line |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
809 vim.opt.inccommand = 'nosplit' -- Show live replacements directly in text |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
810 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
811 vim.opt.autoindent = true |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
812 vim.opt.cindent = true -- C-syntax based indenting |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
813 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
814 vim.opt.updatetime = 300 -- Faster triggering of CursorHold events |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
815 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
816 vim.opt.errorbells = false -- Don't you beep to me |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
817 vim.opt.title = false -- Don't set the shell title |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
818 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
819 vim.opt.history = 1000 -- Remember last commands |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
820 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
821 vim.opt.wildmenu = true -- Command completion |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
822 vim.opt.wildmode = 'longest:full,full' |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
823 vim.opt.shortmess:append 'c' -- Hide ins-completion messages |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
824 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
825 vim.opt.ttyfast = true -- fast terminal |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
826 vim.opt.lazyredraw = true |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
827 vim.opt.ttimeoutlen = -1 -- Minimum timeout |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
828 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
829 vim.opt.diffopt:append 'iwhite' -- Ignore whitespace in diffs |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
830 vim.opt.diffopt:append 'internal' -- Internal diff engine |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
831 vim.opt.diffopt:append 'algorithm:patience' -- Use patience algorithm |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
832 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
833 vim.opt.tags = { '.git/tags', 'tags' } |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
834 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
835 vim.opt.path:append '**' -- Recursively search current directory |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
836 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
837 vim.opt.formatoptions = { |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
838 c = true, -- Wrap comments |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
839 r = true, -- Continue comments |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
840 o = true, -- Insert comment with o/O |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
841 q = true, -- Format comments with gq |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
842 n = true, -- Indent numbered lists |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
843 [2] = true, -- Indent from 2nd line of paragraph |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
844 [1] = true, -- Don't break before one letter words |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
845 } |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
846 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
847 vim.opt.signcolumn = 'yes' -- Always show signcolumn |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
848 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
849 vim.opt.cursorline = true |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
850 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
851 vim.opt.startofline = false -- When moving try to keep cursor in column |
|
543
15d6c097f1c9
set nostartofline to keep cursor in same column when scrolling
zegervdv <zegervdv@me.com>
parents:
541
diff
changeset
|
852 |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
853 -- Show certain characters |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
854 vim.opt.list = true |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
855 vim.opt.listchars = { trail = '·', extends = '>', precedes = '<', nbsp = '+', tab = '▸ ' } |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
856 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
857 vim.opt.sessionoptions:remove 'options' -- Remove options from saved sessions (reload from config) |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
858 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
859 vim.opt.completeopt = { 'menu', 'menuone', 'noselect' } |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
860 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
861 vim.opt.splitright = true -- Open new splits to right |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
862 vim.opt.virtualedit = 'block' -- Enable block editting |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
863 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
864 vim.opt.conceallevel = 0 -- Disable conceal |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
865 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
866 vim.opt.pastetoggle = '<F2>' -- Enable paste mode |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
867 |
|
648
c5ed13440614
Set and optionally create backup and undo dirs
zegervdv <zegervdv@me.com>
parents:
646
diff
changeset
|
868 local optdir = function(path) |
|
c5ed13440614
Set and optionally create backup and undo dirs
zegervdv <zegervdv@me.com>
parents:
646
diff
changeset
|
869 local Path = require 'plenary.path' |
|
c5ed13440614
Set and optionally create backup and undo dirs
zegervdv <zegervdv@me.com>
parents:
646
diff
changeset
|
870 local full_path = Path:new(vim.fn.stdpath 'cache' .. '/' .. path) |
|
c5ed13440614
Set and optionally create backup and undo dirs
zegervdv <zegervdv@me.com>
parents:
646
diff
changeset
|
871 if not full_path:exists() then full_path:mkdir { parents = true } end |
|
c5ed13440614
Set and optionally create backup and undo dirs
zegervdv <zegervdv@me.com>
parents:
646
diff
changeset
|
872 return full_path .. '//' |
|
c5ed13440614
Set and optionally create backup and undo dirs
zegervdv <zegervdv@me.com>
parents:
646
diff
changeset
|
873 end |
|
c5ed13440614
Set and optionally create backup and undo dirs
zegervdv <zegervdv@me.com>
parents:
646
diff
changeset
|
874 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
875 vim.opt.undofile = true -- Persistently remember undos |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
876 vim.opt.undolevels = 1000 |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
877 vim.opt.undodir = optdir 'undo' |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
878 vim.opt.swapfile = false -- Disable swap files |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
879 vim.opt.backup = true -- Keep backups |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
880 vim.opt.backupdir = optdir 'backup' |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
881 |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
882 -- Files to ignore from completion |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
883 vim.opt.wildignore:append { |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
884 '*/tmp/*', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
885 '*.so', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
886 '*.swp', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
887 '*.zip', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
888 '*.o', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
889 '*.bin', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
890 '*.elf', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
891 '*.hex', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
892 '*.eps', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
893 '.git/*', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
894 '*.dup', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
895 '.hg/**', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
896 '*.orig', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
897 '*.*~', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
898 } |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
899 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
900 vim.opt.mouse = { |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
901 n = true, -- Normal mode |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
902 i = true, -- Insert mode |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
903 c = true, -- Commandline mode |
|
738
d63750fc240f
feat: enable visual selection with mouse
zegervdv <zegervdv@me.com>
parents:
737
diff
changeset
|
904 v = true, -- Visual mode |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
905 } |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
906 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
907 vim.opt.fillchars:append { |
| 606 | 908 diff = '╱', |
| 909 } | |
| 910 | |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
911 vim.opt.jumpoptions:append { 'view' } |
|
633
9f040a50eac8
add view to jumpoptions to preserve view when mark was set
zegervdv <zegervdv@me.com>
parents:
632
diff
changeset
|
912 |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
913 vim.opt.foldmethod = 'expr' |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
914 vim.opt.foldexpr = 'nvim_treesitter#foldexpr()' |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
915 vim.opt.foldnestmax = 3 |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
916 vim.opt.foldminlines = 1 |
|
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
917 vim.opt.foldtext = |
| 463 | 918 [[substitute(getline(v:foldstart),'\\t',repeat('\ ',&tabstop),'g').'...'.trim(getline(v:foldend)) . ' (' . (v:foldend - v:foldstart + 1) . ' lines)']] |
|
726
2a341028a2c5
fix: use full vim.opt to avoid diagnostic warnings
zegervdv <zegervdv@me.com>
parents:
725
diff
changeset
|
919 vim.opt.foldenable = false |
| 463 | 920 |
| 616 | 921 function _G.qftf(info) |
| 922 local items | |
| 923 local ret = {} | |
| 924 if info.quickfix == 1 then | |
| 925 items = fn.getqflist({ id = info.id, items = 0 }).items | |
| 926 else | |
| 927 items = fn.getloclist(info.winid, { id = info.id, items = 0 }).items | |
| 928 end | |
| 929 local limit = 31 | |
| 930 local fnameFmt1, fnameFmt2 = '%-' .. limit .. 's', '…%.' .. (limit - 1) .. 's' | |
| 931 local validFmt = '%s │%5d:%-3d│%s %s' | |
| 932 for i = info.start_idx, info.end_idx do | |
| 933 local e = items[i] | |
| 934 local fname = '' | |
| 935 local str | |
| 936 if e.valid == 1 then | |
| 937 if e.bufnr > 0 then | |
| 938 fname = fn.bufname(e.bufnr) | |
| 939 if fname == '' then | |
| 940 fname = '[No Name]' | |
| 941 else | |
| 942 fname = fname:gsub('^' .. vim.env.HOME, '~') | |
| 943 end | |
| 944 -- char in fname may occur more than 1 width, ignore this issue in order to keep performance | |
| 945 if #fname <= limit then | |
| 946 fname = fnameFmt1:format(fname) | |
| 947 else | |
| 948 fname = fnameFmt2:format(fname:sub(1 - limit)) | |
| 949 end | |
| 950 end | |
| 951 local lnum = e.lnum > 99999 and -1 or e.lnum | |
| 952 local col = e.col > 999 and -1 or e.col | |
| 953 local qtype = e.type == '' and '' or ' ' .. e.type:sub(1, 1):upper() | |
| 954 str = validFmt:format(fname, lnum, col, qtype, e.text) | |
| 955 else | |
| 956 str = e.text | |
| 957 end | |
| 958 table.insert(ret, str) | |
| 959 end | |
| 960 return ret | |
| 961 end | |
| 962 | |
| 963 vim.o.qftf = '{info -> v:lua._G.qftf(info)}' | |
| 964 | |
|
520
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
965 -- Clean up terminal codes from strings |
|
600
24b0dd06381b
Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents:
599
diff
changeset
|
966 local t = function(str) return vim.api.nvim_replace_termcodes(str, true, true, true) end |
|
520
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
967 |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
968 -- General keymaps |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
969 local map = vim.keymap.set |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
970 |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
971 -- Set leader to space |
|
639
b6c64ebecc3e
fix: set leader via mapleader option
zegervdv <zegervdv@me.com>
parents:
638
diff
changeset
|
972 vim.g.mapleader = ' ' |
|
520
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
973 |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
974 -- Move while in insert mode |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
975 map('i', '<C-f>', '<right>') |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
976 |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
977 -- Keep search matches centered |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
978 map('n', 'n', 'nzzzv') |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
979 map('n', 'N', 'Nzzzv') |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
980 |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
981 -- Very magic search patterns |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
982 map({ 'n', 'v' }, '/', '/\\v') |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
983 |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
984 -- Move through long lines as breaks |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
985 map('n', 'j', '(v:count ? "j" : "gj")', { expr = true }) |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
986 map('n', 'k', '(v:count ? "k" : "gk")', { expr = true }) |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
987 |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
988 -- Command line search for commands |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
989 map('c', '<c-n>', '<down>') |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
990 map('c', '<c-p>', '<up>') |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
991 |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
992 -- Clear highlighs |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
993 map('n', '<leader>l', '<cmd>noh<CR>', { silent = true }) |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
994 |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
995 -- Reselect last selection |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
996 map('n', 'gV', '`[v`]') |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
997 |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
998 -- Use backspace as normal in visual mode |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
999 map('v', '<BS>', 'x', { remap = true }) |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1000 |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1001 -- Keep selection when indenting |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1002 local keep_visual_selection = function(cmd) |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1003 return function() |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1004 vim.opt.smartindent = false |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1005 if vim.fn.mode() == 'V' then |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1006 return cmd .. t ':set smartindent<CR>gv' |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1007 else |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1008 return cmd .. t ':set smartindent<CR>' |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1009 end |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1010 end |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1011 end |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1012 map('v', '>', keep_visual_selection '>', { expr = true, silent = true, desc = 'Indent right while keeping selection' }) |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1013 map('v', '<', keep_visual_selection '<', { expr = true, silent = true, desc = 'Indent left while keeping selection' }) |
|
f845e2eba7e3
Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents:
519
diff
changeset
|
1014 |
|
574
8b04d5ffd210
Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents:
570
diff
changeset
|
1015 -- Do not move on * |
|
8b04d5ffd210
Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents:
570
diff
changeset
|
1016 map('n', '*', function() |
|
8b04d5ffd210
Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents:
570
diff
changeset
|
1017 local view = vim.fn.winsaveview() |
| 613 | 1018 vim.cmd.normal { '*', bang = true } |
|
574
8b04d5ffd210
Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents:
570
diff
changeset
|
1019 vim.fn.winrestview(view) |
|
599
1def7efdc619
Add trouble.nvim for diagnostics overview
Zeger Van de Vannet <zegervdv@me.com>
parents:
594
diff
changeset
|
1020 end, { |
|
1def7efdc619
Add trouble.nvim for diagnostics overview
Zeger Van de Vannet <zegervdv@me.com>
parents:
594
diff
changeset
|
1021 silent = true, |
|
1def7efdc619
Add trouble.nvim for diagnostics overview
Zeger Van de Vannet <zegervdv@me.com>
parents:
594
diff
changeset
|
1022 desc = 'Search word under cursor without moving to first results', |
|
1def7efdc619
Add trouble.nvim for diagnostics overview
Zeger Van de Vannet <zegervdv@me.com>
parents:
594
diff
changeset
|
1023 }) |
|
574
8b04d5ffd210
Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents:
570
diff
changeset
|
1024 |
| 627 | 1025 map('x', 'p', [[ p:if v:register == '"'<Bar>let @@=@0<Bar>endif<CR> ]], { silent = true }) |
| 1026 | |
|
574
8b04d5ffd210
Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents:
570
diff
changeset
|
1027 map('n', '<UP>', ':cprev<CR>', { desc = 'Go to previous error/match' }) |
|
8b04d5ffd210
Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents:
570
diff
changeset
|
1028 map('n', '<DOWN>', ':cnext<CR>', { desc = 'Go to next error/match' }) |
|
8b04d5ffd210
Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents:
570
diff
changeset
|
1029 map('n', '<LEFT>', ':cpf<CR>', { desc = 'Go to previous error/match in previous file' }) |
|
8b04d5ffd210
Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents:
570
diff
changeset
|
1030 map('n', '<RIGHT>', ':cnf<CR>', { desc = 'Go to next error/match in next file' }) |
|
8b04d5ffd210
Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents:
570
diff
changeset
|
1031 |
| 627 | 1032 map('t', '<C-h>', '<C-\\><C-n><C-w>h') |
| 1033 map('t', '<C-j>', '<C-\\><C-n><C-w>j') | |
| 1034 map('t', '<C-k>', '<C-\\><C-n><C-w>k') | |
| 1035 map('t', '<C-l>', '<C-\\><C-n><C-w>l') | |
| 1036 | |
| 1037 map('c', '<CR>', function() | |
| 1038 local cmdline = vim.fn.getcmdline() | |
| 1039 if cmdline == 'ls' or cmdline == 'buffers' or cmdline == 'files' then return '<CR>:b' end | |
| 1040 return '<CR>' | |
| 1041 end, { expr = true }) | |
| 1042 | |
|
732
18a9b8ccddc3
feat: map escape to clean up screen in normal mode
zegervdv <zegervdv@me.com>
parents:
731
diff
changeset
|
1043 -- Clean up screen |
|
18a9b8ccddc3
feat: map escape to clean up screen in normal mode
zegervdv <zegervdv@me.com>
parents:
731
diff
changeset
|
1044 map('n', '<ESC>', function() |
|
18a9b8ccddc3
feat: map escape to clean up screen in normal mode
zegervdv <zegervdv@me.com>
parents:
731
diff
changeset
|
1045 vim.cmd.nohlsearch() |
|
18a9b8ccddc3
feat: map escape to clean up screen in normal mode
zegervdv <zegervdv@me.com>
parents:
731
diff
changeset
|
1046 vim.cmd.cclose() |
|
18a9b8ccddc3
feat: map escape to clean up screen in normal mode
zegervdv <zegervdv@me.com>
parents:
731
diff
changeset
|
1047 vim.cmd.lclose() |
|
18a9b8ccddc3
feat: map escape to clean up screen in normal mode
zegervdv <zegervdv@me.com>
parents:
731
diff
changeset
|
1048 end, { desc = 'Clean up screen' }) |
|
18a9b8ccddc3
feat: map escape to clean up screen in normal mode
zegervdv <zegervdv@me.com>
parents:
731
diff
changeset
|
1049 |
| 627 | 1050 -- Special highlighting |
| 1051 vim.cmd.match { 'ErrorMsg', [[ '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$' ]] } | |
| 1052 | |
| 489 | 1053 local au = require 'au' |
| 1054 | |
| 1055 -- Highlight yanked text | |
|
600
24b0dd06381b
Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents:
599
diff
changeset
|
1056 au.TextYankPost = function() vim.highlight.on_yank { timeout = 120 } end |
| 489 | 1057 |
| 1058 -- Automatic cursorline | |
| 1059 au.group('cline', { | |
| 1060 { | |
| 1061 'WinEnter', | |
| 1062 '*', | |
| 620 | 1063 function() |
| 1064 if vim.bo.buftype ~= 'nofile' then vim.opt_local.cursorline = true end | |
| 1065 end, | |
| 489 | 1066 }, |
| 1067 { | |
| 1068 'WinLeave', | |
| 1069 '*', | |
|
600
24b0dd06381b
Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents:
599
diff
changeset
|
1070 function() vim.opt_local.cursorline = false end, |
| 489 | 1071 }, |
| 1072 }) | |
| 1073 | |
| 1074 -- Save files on focus lost | |
| 1075 au.FocusLost = function() | |
| 613 | 1076 if not vim.o.readonly and vim.api.nvim_buf_get_name(0) ~= '' then vim.cmd.wa() end |
| 489 | 1077 end |
| 1078 | |
| 1079 -- Equalize splits after resizing | |
| 1080 au.VimResized = [[ exe "normal! \<c-w>=" ]] | |
| 1081 | |
| 1082 -- Reload diffs after editing | |
| 1083 au.BufWritePost = function() | |
| 613 | 1084 if vim.o.diff then vim.cmd.diffupdate() end |
| 489 | 1085 end |
| 1086 | |
| 691 | 1087 -- Open file at last position |
| 1088 au.BufReadPost = function() | |
| 1089 if vim.bo.filetype ~= 'gitcommit' and vim.fn.line '\'"' > 0 and vim.fn.line '\'"' <= vim.fn.line '$' then | |
| 1090 vim.cmd.normal { 'g`"', bang = true } | |
| 1091 end | |
| 1092 end | |
| 1093 | |
| 1094 -- Remove netrw buffers | |
| 1095 au.FileType = { 'netrw', 'setlocal bufhidden=delete' } | |
| 1096 | |
|
696
22efd3b888f8
feat: enable spellchecking for select filetypes
zegervdv <zegervdv@me.com>
parents:
691
diff
changeset
|
1097 -- Enable spelling |
|
22efd3b888f8
feat: enable spellchecking for select filetypes
zegervdv <zegervdv@me.com>
parents:
691
diff
changeset
|
1098 au.FileType = { { 'python', 'systemverilog', 'verilog', 'txt', 'lua' }, function() vim.opt_local.spell = true end } |
|
22efd3b888f8
feat: enable spellchecking for select filetypes
zegervdv <zegervdv@me.com>
parents:
691
diff
changeset
|
1099 |
| 627 | 1100 -- Terminal |
| 1101 au.group('enter_term', { | |
| 1102 { 'TermOpen', '*', 'startinsert!' }, | |
| 1103 { | |
| 1104 'BufEnter', | |
| 1105 '*', | |
| 1106 function() | |
| 1107 if vim.bo.buftype == 'terminal' then vim.cmd.startinsert { bang = true } end | |
| 1108 end, | |
| 1109 }, | |
| 1110 { | |
| 1111 'BufLeave', | |
| 1112 '*', | |
| 1113 function() | |
| 1114 if vim.bo.buftype == 'terminal' then vim.cmd.stopinsert { bang = true } end | |
| 1115 end, | |
| 1116 }, | |
| 1117 }) | |
| 1118 | |
| 691 | 1119 -- Color number categories in reports and logs |
| 1120 au({ 'BufNewFile', 'BufRead', 'BufEnter' }, { | |
| 1121 '*.rpt,*.log', | |
| 1122 function() | |
| 1123 vim.cmd.syntax { 'match', 'String', [["\v<\d{1,3}>"]] } | |
| 1124 vim.cmd.syntax { 'match', 'Statement', [["\v<\d{4,6}>"]] } | |
| 1125 vim.cmd.syntax { 'match', 'Function', [["\v<\d{7,9}>"]] } | |
| 1126 | |
| 1127 vim.cmd.syntax { 'match', 'Number', [["\v<0+>"]] } | |
| 1128 | |
| 1129 vim.cmd.syntax { 'match', 'Error', [["\v\c^error:"]] } | |
| 1130 | |
| 1131 vim.wo.wrap = false | |
| 1132 end, | |
| 1133 }) | |
| 1134 | |
|
688
6e98364a5a28
chore: convert chezmoi autocmds to lua
zegervdv <zegervdv@me.com>
parents:
665
diff
changeset
|
1135 -- Apply changes in chezmoi managed files |
|
6e98364a5a28
chore: convert chezmoi autocmds to lua
zegervdv <zegervdv@me.com>
parents:
665
diff
changeset
|
1136 au.group('chezmoi', { |
|
6e98364a5a28
chore: convert chezmoi autocmds to lua
zegervdv <zegervdv@me.com>
parents:
665
diff
changeset
|
1137 { 'BufWritePost', os.getenv 'HOME' .. '/.local/share/chezmoi/*', 'silent !chezmoi apply --source-path %' }, |
|
6e98364a5a28
chore: convert chezmoi autocmds to lua
zegervdv <zegervdv@me.com>
parents:
665
diff
changeset
|
1138 { |
|
6e98364a5a28
chore: convert chezmoi autocmds to lua
zegervdv <zegervdv@me.com>
parents:
665
diff
changeset
|
1139 'BufWritePost', |
|
6e98364a5a28
chore: convert chezmoi autocmds to lua
zegervdv <zegervdv@me.com>
parents:
665
diff
changeset
|
1140 os.getenv 'HOME' .. '/.local/share/chezmoi/.chezmoitemplates/init.lua', |
|
6e98364a5a28
chore: convert chezmoi autocmds to lua
zegervdv <zegervdv@me.com>
parents:
665
diff
changeset
|
1141 'silent !chezmoi apply --source-path $HOME/.local/share/chezmoi/dot_config/nvim/init.lua.tmpl', |
|
6e98364a5a28
chore: convert chezmoi autocmds to lua
zegervdv <zegervdv@me.com>
parents:
665
diff
changeset
|
1142 }, |
|
6e98364a5a28
chore: convert chezmoi autocmds to lua
zegervdv <zegervdv@me.com>
parents:
665
diff
changeset
|
1143 }) |
|
6e98364a5a28
chore: convert chezmoi autocmds to lua
zegervdv <zegervdv@me.com>
parents:
665
diff
changeset
|
1144 |
| 558 | 1145 -- Snippets |
| 1146 local ls = require 'luasnip' | |
| 1147 -- Expand snippet or jump to next placeholder | |
| 1148 vim.keymap.set({ 'i', 's' }, '<c-k>', function() | |
|
741
aef7dab2b0e5
feat: only jump snippets if inside one
zegervdv <zegervdv@me.com>
parents:
740
diff
changeset
|
1149 if ls.expand_or_locally_jumpable() then ls.expand_or_jump() end |
|
561
6f07ecae3810
Create Ag command in config step
Zeger Van de Vannet <zegervdv@me.com>
parents:
560
diff
changeset
|
1150 end, { |
|
6f07ecae3810
Create Ag command in config step
Zeger Van de Vannet <zegervdv@me.com>
parents:
560
diff
changeset
|
1151 silent = true, |
|
6f07ecae3810
Create Ag command in config step
Zeger Van de Vannet <zegervdv@me.com>
parents:
560
diff
changeset
|
1152 }) |
| 558 | 1153 |
| 1154 -- Go back to previous placeholder | |
| 1155 vim.keymap.set({ 'i', 's' }, '<c-j>', function() | |
|
600
24b0dd06381b
Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents:
599
diff
changeset
|
1156 if ls.jumpable(-1) then ls.jump(-1) end |
|
561
6f07ecae3810
Create Ag command in config step
Zeger Van de Vannet <zegervdv@me.com>
parents:
560
diff
changeset
|
1157 end, { |
|
6f07ecae3810
Create Ag command in config step
Zeger Van de Vannet <zegervdv@me.com>
parents:
560
diff
changeset
|
1158 silent = true, |
|
6f07ecae3810
Create Ag command in config step
Zeger Van de Vannet <zegervdv@me.com>
parents:
560
diff
changeset
|
1159 }) |
| 558 | 1160 |
| 1161 -- Toggle options in snippets | |
| 1162 vim.keymap.set('i', '<c-l>', function() | |
|
600
24b0dd06381b
Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents:
599
diff
changeset
|
1163 if ls.choice_active() then ls.change_choice() end |
| 558 | 1164 end) |
| 1165 | |
|
724
e442bbd36b87
feat: copy current file path relative to repo root and line nr to clipboard
zegervdv <zegervdv@me.com>
parents:
722
diff
changeset
|
1166 -- Copy the current file and line number |
|
e442bbd36b87
feat: copy current file path relative to repo root and line nr to clipboard
zegervdv <zegervdv@me.com>
parents:
722
diff
changeset
|
1167 -- inspired by https://github.com/diegoulloao/nvim-file-location |
|
e442bbd36b87
feat: copy current file path relative to repo root and line nr to clipboard
zegervdv <zegervdv@me.com>
parents:
722
diff
changeset
|
1168 vim.keymap.set('n', '<leader>cp', function() |
|
e442bbd36b87
feat: copy current file path relative to repo root and line nr to clipboard
zegervdv <zegervdv@me.com>
parents:
722
diff
changeset
|
1169 local Path = require 'plenary.path' |
|
e442bbd36b87
feat: copy current file path relative to repo root and line nr to clipboard
zegervdv <zegervdv@me.com>
parents:
722
diff
changeset
|
1170 local current_file = Path:new(vim.fn.expand '%') |
|
e442bbd36b87
feat: copy current file path relative to repo root and line nr to clipboard
zegervdv <zegervdv@me.com>
parents:
722
diff
changeset
|
1171 local root = |
|
e442bbd36b87
feat: copy current file path relative to repo root and line nr to clipboard
zegervdv <zegervdv@me.com>
parents:
722
diff
changeset
|
1172 vim.fs.dirname(vim.fs.find({ '.hg', '.git' }, { path = tostring(current_file:parent()), upward = true })[1]) |
|
e442bbd36b87
feat: copy current file path relative to repo root and line nr to clipboard
zegervdv <zegervdv@me.com>
parents:
722
diff
changeset
|
1173 local current_line = vim.fn.line '.' |
|
e442bbd36b87
feat: copy current file path relative to repo root and line nr to clipboard
zegervdv <zegervdv@me.com>
parents:
722
diff
changeset
|
1174 require('osc52').copy(current_file:make_relative(root) .. ':' .. current_line) |
|
e442bbd36b87
feat: copy current file path relative to repo root and line nr to clipboard
zegervdv <zegervdv@me.com>
parents:
722
diff
changeset
|
1175 vim.notify 'Copied file path and line number' |
|
e442bbd36b87
feat: copy current file path relative to repo root and line nr to clipboard
zegervdv <zegervdv@me.com>
parents:
722
diff
changeset
|
1176 end, { desc = 'Yank current path and line number' }) |
|
e442bbd36b87
feat: copy current file path relative to repo root and line nr to clipboard
zegervdv <zegervdv@me.com>
parents:
722
diff
changeset
|
1177 |
|
725
624d8036f5ae
feat: add window number to inactive window and a mapping to select it
zegervdv <zegervdv@me.com>
parents:
724
diff
changeset
|
1178 -- Navigate between open windows |
|
624d8036f5ae
feat: add window number to inactive window and a mapping to select it
zegervdv <zegervdv@me.com>
parents:
724
diff
changeset
|
1179 for i = 1, 6 do |
|
624d8036f5ae
feat: add window number to inactive window and a mapping to select it
zegervdv <zegervdv@me.com>
parents:
724
diff
changeset
|
1180 vim.keymap.set('n', '<leader>' .. i, i .. '<c-w>w', { desc = 'Go to window ' .. i }) |
|
624d8036f5ae
feat: add window number to inactive window and a mapping to select it
zegervdv <zegervdv@me.com>
parents:
724
diff
changeset
|
1181 end |
|
624d8036f5ae
feat: add window number to inactive window and a mapping to select it
zegervdv <zegervdv@me.com>
parents:
724
diff
changeset
|
1182 |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1183 -- LSP config |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1184 local lsp = require 'lspconfig' |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1185 local null_ls = require 'null-ls' |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1186 |
|
690
424764c7f51a
feat: disable autoformatting, force null-ls formatting in some cases
zegervdv <zegervdv@me.com>
parents:
688
diff
changeset
|
1187 local lsp_formatting = function(bufnr) |
|
424764c7f51a
feat: disable autoformatting, force null-ls formatting in some cases
zegervdv <zegervdv@me.com>
parents:
688
diff
changeset
|
1188 vim.lsp.buf.format { |
|
424764c7f51a
feat: disable autoformatting, force null-ls formatting in some cases
zegervdv <zegervdv@me.com>
parents:
688
diff
changeset
|
1189 filter = function(client) |
|
424764c7f51a
feat: disable autoformatting, force null-ls formatting in some cases
zegervdv <zegervdv@me.com>
parents:
688
diff
changeset
|
1190 local force_null_ls = { 'lua', 'beancount' } |
|
424764c7f51a
feat: disable autoformatting, force null-ls formatting in some cases
zegervdv <zegervdv@me.com>
parents:
688
diff
changeset
|
1191 if vim.tbl_contains(force_null_ls, vim.bo.filetype) then return client.name == 'null-ls' end |
|
424764c7f51a
feat: disable autoformatting, force null-ls formatting in some cases
zegervdv <zegervdv@me.com>
parents:
688
diff
changeset
|
1192 return true |
|
424764c7f51a
feat: disable autoformatting, force null-ls formatting in some cases
zegervdv <zegervdv@me.com>
parents:
688
diff
changeset
|
1193 end, |
|
424764c7f51a
feat: disable autoformatting, force null-ls formatting in some cases
zegervdv <zegervdv@me.com>
parents:
688
diff
changeset
|
1194 bufnr = bufnr, |
|
424764c7f51a
feat: disable autoformatting, force null-ls formatting in some cases
zegervdv <zegervdv@me.com>
parents:
688
diff
changeset
|
1195 } |
|
424764c7f51a
feat: disable autoformatting, force null-ls formatting in some cases
zegervdv <zegervdv@me.com>
parents:
688
diff
changeset
|
1196 end |
|
424764c7f51a
feat: disable autoformatting, force null-ls formatting in some cases
zegervdv <zegervdv@me.com>
parents:
688
diff
changeset
|
1197 |
|
718
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
1198 local on_attach = function(client, bufnr) |
|
600
24b0dd06381b
Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents:
599
diff
changeset
|
1199 local nmap = function(lhs, rhs, opts) return vim.keymap.set('n', lhs, rhs, opts) end |
|
462
676d7ef5fecb
Use tagfunc to query LSP for definitions
zegervdv <zegervdv@me.com>
parents:
460
diff
changeset
|
1200 |
|
722
20256729c355
fix: use current bufnr for formatting
zegervdv <zegervdv@me.com>
parents:
720
diff
changeset
|
1201 local opts = { silent = true, buffer = bufnr } |
|
20256729c355
fix: use current bufnr for formatting
zegervdv <zegervdv@me.com>
parents:
720
diff
changeset
|
1202 |
|
20256729c355
fix: use current bufnr for formatting
zegervdv <zegervdv@me.com>
parents:
720
diff
changeset
|
1203 nmap('gp', require('goto-preview').goto_preview_definition, opts) |
|
20256729c355
fix: use current bufnr for formatting
zegervdv <zegervdv@me.com>
parents:
720
diff
changeset
|
1204 nmap('gP', require('goto-preview').close_all_win, opts) |
|
462
676d7ef5fecb
Use tagfunc to query LSP for definitions
zegervdv <zegervdv@me.com>
parents:
460
diff
changeset
|
1205 |
|
722
20256729c355
fix: use current bufnr for formatting
zegervdv <zegervdv@me.com>
parents:
720
diff
changeset
|
1206 nmap('gd', vim.lsp.buf.declaration, opts) |
|
20256729c355
fix: use current bufnr for formatting
zegervdv <zegervdv@me.com>
parents:
720
diff
changeset
|
1207 nmap('K', vim.lsp.buf.hover, opts) |
|
20256729c355
fix: use current bufnr for formatting
zegervdv <zegervdv@me.com>
parents:
720
diff
changeset
|
1208 nmap('gD', vim.lsp.buf.implementation, opts) |
|
20256729c355
fix: use current bufnr for formatting
zegervdv <zegervdv@me.com>
parents:
720
diff
changeset
|
1209 nmap('1gD', vim.lsp.buf.type_definition, opts) |
|
20256729c355
fix: use current bufnr for formatting
zegervdv <zegervdv@me.com>
parents:
720
diff
changeset
|
1210 nmap('gr', vim.lsp.buf.references, opts) |
|
20256729c355
fix: use current bufnr for formatting
zegervdv <zegervdv@me.com>
parents:
720
diff
changeset
|
1211 nmap('g0', vim.lsp.buf.document_symbol, opts) |
|
20256729c355
fix: use current bufnr for formatting
zegervdv <zegervdv@me.com>
parents:
720
diff
changeset
|
1212 nmap('ga', vim.lsp.buf.code_action, opts) |
| 513 | 1213 |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1214 vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(vim.lsp.handlers.hover, { border = 'single' }) |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1215 vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(vim.lsp.handlers.hover, { border = 'single' }) |
|
718
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
1216 |
|
729
58fc7cc955d1
feat: disable sumneko formatting
zegervdv <zegervdv@me.com>
parents:
728
diff
changeset
|
1217 if client.name == 'sumneko_lua' then |
|
58fc7cc955d1
feat: disable sumneko formatting
zegervdv <zegervdv@me.com>
parents:
728
diff
changeset
|
1218 client.server_capabilities.documentFormattingProvider = false |
|
58fc7cc955d1
feat: disable sumneko formatting
zegervdv <zegervdv@me.com>
parents:
728
diff
changeset
|
1219 client.server_capabilities.documentRangeFormattingProvider = false |
|
58fc7cc955d1
feat: disable sumneko formatting
zegervdv <zegervdv@me.com>
parents:
728
diff
changeset
|
1220 end |
|
58fc7cc955d1
feat: disable sumneko formatting
zegervdv <zegervdv@me.com>
parents:
728
diff
changeset
|
1221 |
|
718
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
1222 if client.supports_method 'textDocument/rangeFormatting' then |
|
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
1223 local root = vim.fs.find({ '.git', '.hg' }, { path = client.config.root_dir }) |
|
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
1224 local vcs = 'git' |
|
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
1225 if root then vcs = vim.fs.basename(root[1]):sub(2) end |
|
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
1226 |
|
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
1227 vim.notify('Enabled modification formatting via ' .. vcs .. ' using ' .. client.name, vim.log.levels.INFO) |
|
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
1228 local lsp_format_modifications = require 'lsp-format-modifications' |
|
719
08baa6419e7d
fix: pass vcs config to format-modifications attach function
zegervdv <zegervdv@me.com>
parents:
718
diff
changeset
|
1229 lsp_format_modifications.attach(client, bufnr, { format_on_save = false, vcs = vcs }) |
|
722
20256729c355
fix: use current bufnr for formatting
zegervdv <zegervdv@me.com>
parents:
720
diff
changeset
|
1230 nmap('<c-p>', function() lsp_format_modifications.format_modifications_current_buffer() end, opts) |
|
718
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
1231 elseif client.supports_method 'textDocument/formatting' then |
|
722
20256729c355
fix: use current bufnr for formatting
zegervdv <zegervdv@me.com>
parents:
720
diff
changeset
|
1232 nmap('<c-p>', function() lsp_formatting(bufnr) end, opts) |
|
718
451632dcb1dd
feat: add lsp-format-modifications
zegervdv <zegervdv@me.com>
parents:
716
diff
changeset
|
1233 end |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1234 end |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1235 |
|
704
c78a2c1388e9
fix: update cmp-nvim-lsp capabilities config
zegervdv <zegervdv@me.com>
parents:
703
diff
changeset
|
1236 local capabilities = require('cmp_nvim_lsp').default_capabilities() |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1237 capabilities.textDocument.completion.completionItem.snippetSupport = true |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1238 capabilities.textDocument.completion.completionItem.resolveSupport = { |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1239 properties = { |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1240 'documentation', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1241 'detail', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1242 'additionalTextEdits', |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1243 }, |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1244 } |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1245 |
|
532
e932c2076dba
Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents:
529
diff
changeset
|
1246 local root_dir = require('lspconfig.util').root_pattern('.git', '.hg') |
|
e932c2076dba
Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents:
529
diff
changeset
|
1247 |
|
e932c2076dba
Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents:
529
diff
changeset
|
1248 lsp.pyright.setup { on_attach = on_attach, capabilities = capabilities, root_dir = root_dir } |
| 646 | 1249 lsp.bashls.setup { on_attach = on_attach, capabilities = capabilities } |
|
532
e932c2076dba
Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents:
529
diff
changeset
|
1250 |
|
e932c2076dba
Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents:
529
diff
changeset
|
1251 lsp.esbonio.setup { |
|
e932c2076dba
Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents:
529
diff
changeset
|
1252 on_attach = on_attach, |
|
e932c2076dba
Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents:
529
diff
changeset
|
1253 capabilities = capabilities, |
|
e932c2076dba
Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents:
529
diff
changeset
|
1254 root_dir = root_dir, |
|
e932c2076dba
Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents:
529
diff
changeset
|
1255 -- Assume esbonio is installed with --user |
| 579 | 1256 cmd = { home .. '/.local/bin/esbonio' }, |
|
532
e932c2076dba
Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents:
529
diff
changeset
|
1257 } |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1258 |
| 581 | 1259 lsp.clangd.setup { |
| 1260 on_attach = on_attach, | |
| 1261 capabilities = capabilities, | |
| 1262 root_dir = root_dir, | |
| 1263 } | |
| 1264 | |
| 638 | 1265 local bean_file = os.getenv 'BEAN_FILE' |
| 1266 if bean_file then | |
| 1267 lsp.beancount.setup { | |
| 1268 on_attach = on_attach, | |
| 1269 capabilities = capabilities, | |
| 1270 root_dir = root_dir, | |
| 1271 init_options = { | |
| 1272 journal_file = bean_file, | |
| 1273 }, | |
| 1274 } | |
| 1275 local helpers = require 'null-ls.helpers' | |
| 1276 local bean_format = { | |
| 1277 name = 'bean-format', | |
| 1278 filetypes = { 'beancount' }, | |
| 1279 method = null_ls.methods.FORMATTING, | |
| 1280 generator = helpers.formatter_factory { | |
| 1281 command = 'bean-format', | |
| 1282 args = { '-w', '80' }, | |
| 1283 to_stdin = true, | |
| 1284 }, | |
| 1285 } | |
| 1286 null_ls.register { bean_format } | |
| 1287 end | |
| 1288 | |
|
512
fc7a15e47e72
update null-ls config to remove lspconfig dependency
zegervdv <zegervdv@me.com>
parents:
511
diff
changeset
|
1289 null_ls.setup { |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1290 sources = { |
|
607
9a7fe4a97873
wrap lines at 100 chars with black
Zeger Van de Vannet <zegervdv@me.com>
parents:
606
diff
changeset
|
1291 null_ls.builtins.formatting.black.with { extra_args = { '--line-length', '100' } }, |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1292 null_ls.builtins.formatting.stylua, |
|
623
5cceedc51955
Add cbfmt and markdown/rst tree sitters
zegervdv <zegervdv@me.com>
parents:
622
diff
changeset
|
1293 null_ls.builtins.formatting.cbfmt, |
| 502 | 1294 null_ls.builtins.diagnostics.shellcheck, |
|
509
80b42722bfa8
Add prettier formatting to null-ls
zegervdv <zegervdv@me.com>
parents:
503
diff
changeset
|
1295 null_ls.builtins.formatting.prettier, |
| 622 | 1296 null_ls.builtins.code_actions.gitrebase, |
| 730 | 1297 null_ls.builtins.hover.printenv, |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1298 }, |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1299 on_attach = on_attach, |
|
512
fc7a15e47e72
update null-ls config to remove lspconfig dependency
zegervdv <zegervdv@me.com>
parents:
511
diff
changeset
|
1300 root_dir = require('null-ls.utils').root_pattern('.hg', '.git', 'stylua.toml'), |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1301 } |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1302 |
|
713
45c34cfecc3e
feat: enable full neodev options in chezmoi folder
zegervdv <zegervdv@me.com>
parents:
706
diff
changeset
|
1303 require('neodev').setup { |
|
45c34cfecc3e
feat: enable full neodev options in chezmoi folder
zegervdv <zegervdv@me.com>
parents:
706
diff
changeset
|
1304 override = function(root_dir, options) |
|
45c34cfecc3e
feat: enable full neodev options in chezmoi folder
zegervdv <zegervdv@me.com>
parents:
706
diff
changeset
|
1305 if require('neodev.util').has_file(root_dir, '~/.local/share/chezmoi') then |
|
45c34cfecc3e
feat: enable full neodev options in chezmoi folder
zegervdv <zegervdv@me.com>
parents:
706
diff
changeset
|
1306 options.enabled = true |
|
45c34cfecc3e
feat: enable full neodev options in chezmoi folder
zegervdv <zegervdv@me.com>
parents:
706
diff
changeset
|
1307 options.runtime = true |
|
45c34cfecc3e
feat: enable full neodev options in chezmoi folder
zegervdv <zegervdv@me.com>
parents:
706
diff
changeset
|
1308 options.types = true |
|
45c34cfecc3e
feat: enable full neodev options in chezmoi folder
zegervdv <zegervdv@me.com>
parents:
706
diff
changeset
|
1309 options.plugins = true |
|
45c34cfecc3e
feat: enable full neodev options in chezmoi folder
zegervdv <zegervdv@me.com>
parents:
706
diff
changeset
|
1310 end |
|
45c34cfecc3e
feat: enable full neodev options in chezmoi folder
zegervdv <zegervdv@me.com>
parents:
706
diff
changeset
|
1311 end, |
|
45c34cfecc3e
feat: enable full neodev options in chezmoi folder
zegervdv <zegervdv@me.com>
parents:
706
diff
changeset
|
1312 } |
|
703
50c025a59b95
fix: update lua-dev to neodev config
zegervdv <zegervdv@me.com>
parents:
702
diff
changeset
|
1313 lsp.sumneko_lua.setup { |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1314 lspconfig = { |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1315 cmd = { 'lua-language-server' }, |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1316 on_attach = on_attach, |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1317 capabilities = capabilities, |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1318 settings = { |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1319 Lua = { |
|
703
50c025a59b95
fix: update lua-dev to neodev config
zegervdv <zegervdv@me.com>
parents:
702
diff
changeset
|
1320 completion = { |
|
50c025a59b95
fix: update lua-dev to neodev config
zegervdv <zegervdv@me.com>
parents:
702
diff
changeset
|
1321 callSnippet = 'Replace', |
|
50c025a59b95
fix: update lua-dev to neodev config
zegervdv <zegervdv@me.com>
parents:
702
diff
changeset
|
1322 }, |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1323 }, |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1324 }, |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1325 }, |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1326 } |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1327 |
| 582 | 1328 local fd_quickfix = function(args) |
| 1329 local grepprg = vim.opt.grepprg | |
| 1330 local grepformat = vim.opt.grepformat | |
| 1331 | |
| 1332 vim.opt.grepprg = 'fd' | |
| 1333 vim.opt.grepformat = '%f' | |
| 613 | 1334 vim.cmd.execute('"silent! grep! ' .. args.args .. '"') |
| 1335 vim.cmd.copen() | |
| 582 | 1336 |
| 1337 vim.opt.grepprg = grepprg | |
| 1338 vim.opt.grepformat = grepformat | |
| 1339 end | |
| 589 | 1340 vim.api.nvim_create_user_command('Cfd', fd_quickfix, { nargs = '+', complete = 'file' }) |
| 582 | 1341 |
|
466
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1342 vim.diagnostic.config { |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1343 underline = true, |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1344 update_in_insert = false, |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1345 virtual_text = { severity = { min = vim.diagnostic.severity.WARN }, source = 'always' }, |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1346 severity_sort = true, |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1347 } |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1348 |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1349 vim.fn.sign_define('DiagnosticSignError', { texthl = 'DiagnosticSignError', linehl = '', numhl = '', text = '▎' }) |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1350 vim.fn.sign_define('DiagnosticSignWarn', { |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1351 texthl = 'DiagnosticSignWarn', |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1352 linehl = '', |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1353 numhl = '', |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1354 text = '▎', |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1355 }) |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1356 vim.fn.sign_define('DiagnosticSignInfo', { |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1357 texthl = 'DiagnosticSignInfo', |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1358 linehl = '', |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1359 numhl = '', |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1360 text = '▎', |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1361 }) |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1362 vim.fn.sign_define('DiagnosticSignHint', { texthl = 'DiagnosticSignHint', linehl = '', numhl = '', text = '▎' }) |
|
899cded39cd3
Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents:
465
diff
changeset
|
1363 |
|
451
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1364 -- Try importing local config |
|
d99353d71702
Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff
changeset
|
1365 local ok, localconfig = pcall(require, 'localconfig') |
|
600
24b0dd06381b
Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents:
599
diff
changeset
|
1366 if ok then localconfig.setup { on_attach = on_attach, capabilities = capabilities } end |