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