annotate .chezmoitemplates/init.lua @ 634:38a7bca2ba51

Add cmp-cmdline-history plugin to also complete history
author zegervdv <zegervdv@me.com>
date Sat, 06 Aug 2022 11:37:59 +0200
parents 9f040a50eac8
children 44c31cfaaf8a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
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
4e25c3d4470d handle HOME on windows
zegervdv <zegervdv@me.com>
parents: 577
diff changeset
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
c79b392e7919 Use indexed vim.cmd
zegervdv <zegervdv@me.com>
parents: 612
diff changeset
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
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
21 require('packer').startup(function()
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
22 use { 'wbthomason/packer.nvim', opt = true }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
23
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
24 -- General plugins
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
25 use { 'tpope/vim-sensible' }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
26 use { 'tpope/vim-repeat' }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
27 use { 'tpope/vim-rsi' }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
28 use { 'sgur/vim-editorconfig' }
614
ad5e870cd4b2 replace osc52 plugin
zegervdv <zegervdv@me.com>
parents: 613
diff changeset
29 use {
ad5e870cd4b2 replace osc52 plugin
zegervdv <zegervdv@me.com>
parents: 613
diff changeset
30 'ojroques/nvim-osc52',
ad5e870cd4b2 replace osc52 plugin
zegervdv <zegervdv@me.com>
parents: 613
diff changeset
31 config = function()
619
6bd8aecfdaaa use the updated trim function from nvim-osc52
zegervdv <zegervdv@me.com>
parents: 618
diff changeset
32 require('osc52').setup { trim = true }
6bd8aecfdaaa use the updated trim function from nvim-osc52
zegervdv <zegervdv@me.com>
parents: 618
diff changeset
33 local copy = function(lines, _) require('osc52').copy(table.concat(lines, '\n')) end
614
ad5e870cd4b2 replace osc52 plugin
zegervdv <zegervdv@me.com>
parents: 613
diff changeset
34 local paste = function() return { vim.fn.split(vim.fn.getreg '', '\n'), vim.fn.getregtype '' } end
ad5e870cd4b2 replace osc52 plugin
zegervdv <zegervdv@me.com>
parents: 613
diff changeset
35 vim.g.clipboard = {
ad5e870cd4b2 replace osc52 plugin
zegervdv <zegervdv@me.com>
parents: 613
diff changeset
36 name = 'osc52',
ad5e870cd4b2 replace osc52 plugin
zegervdv <zegervdv@me.com>
parents: 613
diff changeset
37 copy = { ['+'] = copy, ['*'] = copy },
ad5e870cd4b2 replace osc52 plugin
zegervdv <zegervdv@me.com>
parents: 613
diff changeset
38 paste = { ['+'] = paste, ['*'] = paste },
ad5e870cd4b2 replace osc52 plugin
zegervdv <zegervdv@me.com>
parents: 613
diff changeset
39 }
ad5e870cd4b2 replace osc52 plugin
zegervdv <zegervdv@me.com>
parents: 613
diff changeset
40 end,
ad5e870cd4b2 replace osc52 plugin
zegervdv <zegervdv@me.com>
parents: 613
diff changeset
41 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
42
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
43 use {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
44 'tpope/vim-eunuch',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
45 cmd = {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
46 'Delete',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
47 'Unlink',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
48 'Move',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
49 'Rename',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
50 'Mkdir',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
51 'Chmod',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
52 'Cfind',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
53 'Clocate',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
54 'Lfind',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
55 'Llocate',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
56 'SudoEdit',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
57 'SudoWrite',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
58 'Wall',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
59 },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
60 }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
61
488
8edc5f86e9c3 Remove unused icon plugins
zegervdv <zegervdv@me.com>
parents: 487
diff changeset
62 -- Smooth scrolling
515
67a4228c6532 Switch to neoscroll for even faster smooth scrolling
zegervdv <zegervdv@me.com>
parents: 514
diff changeset
63 use {
67a4228c6532 Switch to neoscroll for even faster smooth scrolling
zegervdv <zegervdv@me.com>
parents: 514
diff changeset
64 'karb94/neoscroll.nvim',
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
65 config = function() require('neoscroll').setup {} end,
515
67a4228c6532 Switch to neoscroll for even faster smooth scrolling
zegervdv <zegervdv@me.com>
parents: 514
diff changeset
66 }
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
67
488
8edc5f86e9c3 Remove unused icon plugins
zegervdv <zegervdv@me.com>
parents: 487
diff changeset
68 -- Faster lua package loading (until 15436 is merged)
522
fb4ecca62a55 Enable impatient
zegervdv <zegervdv@me.com>
parents: 521
diff changeset
69 use {
fb4ecca62a55 Enable impatient
zegervdv <zegervdv@me.com>
parents: 521
diff changeset
70 'lewis6991/impatient.nvim',
fb4ecca62a55 Enable impatient
zegervdv <zegervdv@me.com>
parents: 521
diff changeset
71 module = { 'impatient' },
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
72 setup = function() require 'impatient' end,
522
fb4ecca62a55 Enable impatient
zegervdv <zegervdv@me.com>
parents: 521
diff changeset
73 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
74
488
8edc5f86e9c3 Remove unused icon plugins
zegervdv <zegervdv@me.com>
parents: 487
diff changeset
75 -- Library with lua functions
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
76 use { 'nvim-lua/plenary.nvim' }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
77
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
78 -- Spelling/autocorrection
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
79 use { 'tpope/vim-abolish' }
482
64f8a54e372d Add impatient
zegervdv <zegervdv@me.com>
parents: 480
diff changeset
80
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
81 -- Git/VCS
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
82 use { 'vim-scripts/gitignore' }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
83 use {
625
c8960ba7f019 Update settings for settle.nvim
zegervdv <zegervdv@me.com>
parents: 624
diff changeset
84 'zegervdv/settle.nvim',
516
cf71ce0b06d3 Enable merge.nvim
zegervdv <zegervdv@me.com>
parents: 515
diff changeset
85 opt = true,
625
c8960ba7f019 Update settings for settle.nvim
zegervdv <zegervdv@me.com>
parents: 624
diff changeset
86 cmd = { 'SettleInit' },
516
cf71ce0b06d3 Enable merge.nvim
zegervdv <zegervdv@me.com>
parents: 515
diff changeset
87 config = function()
625
c8960ba7f019 Update settings for settle.nvim
zegervdv <zegervdv@me.com>
parents: 624
diff changeset
88 require('settle').setup {
517
0ed17680bf08 Use callback hook to disable dirvish maps when merging
zegervdv <zegervdv@me.com>
parents: 516
diff changeset
89 wrap = true,
625
c8960ba7f019 Update settings for settle.nvim
zegervdv <zegervdv@me.com>
parents: 624
diff changeset
90 symbol = '▊',
517
0ed17680bf08 Use callback hook to disable dirvish maps when merging
zegervdv <zegervdv@me.com>
parents: 516
diff changeset
91 pre_hook = function()
0ed17680bf08 Use callback hook to disable dirvish maps when merging
zegervdv <zegervdv@me.com>
parents: 516
diff changeset
92 -- disable dirvish
0ed17680bf08 Use callback hook to disable dirvish maps when merging
zegervdv <zegervdv@me.com>
parents: 516
diff changeset
93 vim.api.nvim_del_keymap('n', '-')
0ed17680bf08 Use callback hook to disable dirvish maps when merging
zegervdv <zegervdv@me.com>
parents: 516
diff changeset
94 end,
0ed17680bf08 Use callback hook to disable dirvish maps when merging
zegervdv <zegervdv@me.com>
parents: 516
diff changeset
95 }
516
cf71ce0b06d3 Enable merge.nvim
zegervdv <zegervdv@me.com>
parents: 515
diff changeset
96 end,
cf71ce0b06d3 Enable merge.nvim
zegervdv <zegervdv@me.com>
parents: 515
diff changeset
97 }
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
98 use { 'tpope/vim-git', ft = { 'gitcommit', 'gitrebase' } }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
99
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
100 -- Comments
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
101 use {
497
852acbe7ae8e Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents: 496
diff changeset
102 'numToStr/Comment.nvim',
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
103 config = function()
497
852acbe7ae8e Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents: 496
diff changeset
104 local ft = require 'Comment.ft'
852acbe7ae8e Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents: 496
diff changeset
105 ft.systemverilog = { '//%s', '/*%s*/' }
852acbe7ae8e Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents: 496
diff changeset
106 ft.verilog = { '//%s', '/*%s*/' }
852acbe7ae8e Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents: 496
diff changeset
107
852acbe7ae8e Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents: 496
diff changeset
108 require('Comment').setup {
852acbe7ae8e Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents: 496
diff changeset
109 padding = true,
852acbe7ae8e Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents: 496
diff changeset
110 sticky = true,
852acbe7ae8e Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents: 496
diff changeset
111 ignore = '^(%s*)$',
499
568791ef3a16 Enable extra mappings for comment.nvim
zegervdv <zegervdv@me.com>
parents: 497
diff changeset
112 mappings = {
568791ef3a16 Enable extra mappings for comment.nvim
zegervdv <zegervdv@me.com>
parents: 497
diff changeset
113 basic = true,
568791ef3a16 Enable extra mappings for comment.nvim
zegervdv <zegervdv@me.com>
parents: 497
diff changeset
114 extra = true,
568791ef3a16 Enable extra mappings for comment.nvim
zegervdv <zegervdv@me.com>
parents: 497
diff changeset
115 },
497
852acbe7ae8e Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents: 496
diff changeset
116 }
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
117 end,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
118 keys = {
497
852acbe7ae8e Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents: 496
diff changeset
119 { 'n', 'gc' },
852acbe7ae8e Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents: 496
diff changeset
120 { 'n', 'gb' },
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
121 { 'v', 'gc' },
497
852acbe7ae8e Use Comment.nvim for more control when commenting
zegervdv <zegervdv@me.com>
parents: 496
diff changeset
122 { 'v', 'gb' },
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
123 },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
124 }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
125
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
126 -- Parentheses etc
604
cfd937d65fdc replace vim-surround with nvim-surround
zegervdv <zegervdv@me.com>
parents: 603
diff changeset
127 use { 'kylechui/nvim-surround', config = function() require('nvim-surround').setup() end }
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
128 use {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
129 'windwp/nvim-autopairs',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
130 config = function()
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
131 local npairs = require 'nvim-autopairs'
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
132 local Rule = require 'nvim-autopairs.rule'
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
133
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
134 local cmp = require 'nvim-autopairs.completion.cmp'
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
135
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
136 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
137
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
138 npairs.setup {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
139 ignored_next_char = string.gsub([[ [%w%%%'%[%.] ]], '%s+', ''),
585
05e78f59392c Disable weird afterquote behaviour in autopairs
zegervdv <zegervdv@me.com>
parents: 584
diff changeset
140 enable_afterquote = false,
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
141 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
142
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
143 npairs.add_rules {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
144 Rule(' ', ' '):with_pair(function(opts)
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
145 local pair = opts.line:sub(opts.col - 1, opts.col)
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
146 return vim.tbl_contains({ '()', '[]', '{}' }, pair)
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
147 end),
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
148 Rule('( ', ' )')
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
149 :with_pair(function() return false end)
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
150 :with_move(function(opts) return opts.prev_char:match '.%)' ~= nil end)
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
151 :use_key ')',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
152 Rule('{ ', ' }')
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
153 :with_pair(function() return false end)
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
154 :with_move(function(opts) return opts.prev_char:match '.%}' ~= nil end)
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
155 :use_key '}',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
156 Rule('[ ', ' ]')
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
157 :with_pair(function() return false end)
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
158 :with_move(function(opts) return opts.prev_char:match '.%]' ~= nil end)
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
159 :use_key ']',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
160 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
161
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
162 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
163
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
164 npairs.get_rule("'")[1]: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
165 end,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
166 after = { 'nvim-cmp' },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
167 }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
168
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
169 -- Moving around within lines
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
170 use { 'wellle/targets.vim', event = 'InsertEnter *' }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
171
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
172 -- Searching
514
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
173 use {
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
174 'mhinz/vim-grepper',
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
175 cmd = { 'Grepper', 'Ag' },
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
176 keys = { { 'n', 'gs' }, { 'x', 'gs' } },
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
177 config = function()
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
178 vim.g.grepper = {
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
179 tools = { 'ag', 'hg' },
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
180 highlight = 1,
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
181 ag = {
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
182 grepprg = 'rg --vimgrep',
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
183 },
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
184 }
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
185
561
6f07ecae3810 Create Ag command in config step
Zeger Van de Vannet <zegervdv@me.com>
parents: 560
diff changeset
186 vim.keymap.set({ 'x', 'n' }, 'gs', '<plug>(GrepperOperator)')
589
6bb59cb7cdd4 update nvim api for 0.7
zegervdv <zegervdv@me.com>
parents: 585
diff changeset
187 vim.api.nvim_create_user_command(
514
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
188 'Ag',
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
189 'Grepper -noprompt -tool ag -grepprg rg --vimgrep <args>',
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
190 { complete = 'file', nargs = '*' }
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
191 )
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
192 end,
f0c94c3f5fd9 Use new user_command api to define commands
zegervdv <zegervdv@me.com>
parents: 513
diff changeset
193 }
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
194
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
195 -- Opening files
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
196 use { 'wsdjeg/vim-fetch' }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
197
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
198 -- session management
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
199 use {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
200 'folke/persistence.nvim',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
201 event = 'BufReadPre',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
202 module = 'persistence',
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
203 config = function() require('persistence').setup() end,
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
204 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
205
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
206 -- Indent lines
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
207 use {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
208 'lukas-reineke/indent-blankline.nvim',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
209 config = function()
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
210 vim.g.indent_blankline_buftype_exclude = { 'terminal', 'help', 'nofile' }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
211 vim.g.indent_blankline_show_first_indent_level = false
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
212 vim.g.indent_blankline_char = '│'
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
213 end,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
214 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
215
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
216 -- Increment/decrement
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
217 use {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
218 'zegervdv/nrpattern.nvim',
631
6372f0542bed remove splice config
zegervdv <zegervdv@me.com>
parents: 629
diff changeset
219 branch = 'lua',
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
220 requires = 'tpope/vim-repeat',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
221 config = function()
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
222 local nrpattern = require 'nrpattern'
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
223 local defaults = require 'nrpattern.default'
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
224
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
225 defaults[{ 'input', 'output' }] = { priority = 12, filetypes = { 'verilog', 'systemverilog' } }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
226 defaults[{ "'1", "'0" }] = { priority = 9, filetypes = { 'verilog', 'systemverilog' } }
478
8d8455911071 Use persistence.nvim for after the fact session management
Zeger Van de Vannet <zegervdv@me.com>
parents: 477
diff changeset
227
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
228 nrpattern.setup(defaults)
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
229 end,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
230 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
231
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
232 -- Tmux
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
233 use {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
234 'numtostr/navigator.nvim',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
235 config = function()
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
236 require('Navigator').setup { auto_save = 'current', disable_on_zoom = true }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
237
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
238 local nmap = function(lhs, rhs, opts) return vim.keymap.set('n', lhs, rhs, opts) end
520
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
239 nmap('<c-h>', require('Navigator').left, { silent = true })
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
240 nmap('<c-j>', require('Navigator').down, { silent = true })
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
241 nmap('<c-k>', require('Navigator').up, { silent = true })
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
242 nmap('<c-l>', require('Navigator').right, { silent = true })
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
243 end,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
244 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
245
632
ca2687d578d2 Add which-key for lesser used keymaps
zegervdv <zegervdv@me.com>
parents: 631
diff changeset
246 -- Keymap help
ca2687d578d2 Add which-key for lesser used keymaps
zegervdv <zegervdv@me.com>
parents: 631
diff changeset
247 use {
ca2687d578d2 Add which-key for lesser used keymaps
zegervdv <zegervdv@me.com>
parents: 631
diff changeset
248 'folke/which-key.nvim',
ca2687d578d2 Add which-key for lesser used keymaps
zegervdv <zegervdv@me.com>
parents: 631
diff changeset
249 config = function()
ca2687d578d2 Add which-key for lesser used keymaps
zegervdv <zegervdv@me.com>
parents: 631
diff changeset
250 require('which-key').setup {
ca2687d578d2 Add which-key for lesser used keymaps
zegervdv <zegervdv@me.com>
parents: 631
diff changeset
251 triggers = { '<leader>', 'g', '<c-w>', '"', '`' },
ca2687d578d2 Add which-key for lesser used keymaps
zegervdv <zegervdv@me.com>
parents: 631
diff changeset
252 }
ca2687d578d2 Add which-key for lesser used keymaps
zegervdv <zegervdv@me.com>
parents: 631
diff changeset
253 end,
ca2687d578d2 Add which-key for lesser used keymaps
zegervdv <zegervdv@me.com>
parents: 631
diff changeset
254 }
ca2687d578d2 Add which-key for lesser used keymaps
zegervdv <zegervdv@me.com>
parents: 631
diff changeset
255
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
256 -- Completion/snippets/LSP
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
257 use { 'neovim/nvim-lspconfig' }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
258 use {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
259 'hrsh7th/nvim-cmp',
518
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
260 requires = {
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
261 'hrsh7th/cmp-buffer',
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
262 'hrsh7th/cmp-nvim-lsp',
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
263 'saadparwaiz1/cmp_luasnip',
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
264 'hrsh7th/cmp-path',
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
265 'hrsh7th/cmp-cmdline',
557
bb1e1f4320d5 Add signature help completion
zegervdv <zegervdv@me.com>
parents: 555
diff changeset
266 'hrsh7th/cmp-nvim-lsp-signature-help',
634
38a7bca2ba51 Add cmp-cmdline-history plugin to also complete history
zegervdv <zegervdv@me.com>
parents: 633
diff changeset
267 'dmitmel/cmp-cmdline-history',
518
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
268 },
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
269 config = function()
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
270 local cmp = require 'cmp'
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
271 local luasnip = require 'luasnip'
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
272
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
273 local has_words_before = function()
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
274 local line, col = unpack(vim.api.nvim_win_get_cursor(0))
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
275 return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match '%s' == nil
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
276 end
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
277
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
278 cmp.setup {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
279 snippet = {
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
280 expand = function(args) luasnip.lsp_expand(args.body) end,
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
281 },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
282 mapping = {
594
e8615fbcf11b Fix mappings for cmp
zegervdv <zegervdv@me.com>
parents: 593
diff changeset
283 ['<C-p>'] = { i = cmp.mapping.select_prev_item() },
e8615fbcf11b Fix mappings for cmp
zegervdv <zegervdv@me.com>
parents: 593
diff changeset
284 ['<C-n>'] = { i = cmp.mapping.select_next_item() },
e8615fbcf11b Fix mappings for cmp
zegervdv <zegervdv@me.com>
parents: 593
diff changeset
285 ['<C-d>'] = { i = cmp.mapping.scroll_docs(-4) },
e8615fbcf11b Fix mappings for cmp
zegervdv <zegervdv@me.com>
parents: 593
diff changeset
286 ['<C-y>'] = { i = cmp.mapping.complete() },
e8615fbcf11b Fix mappings for cmp
zegervdv <zegervdv@me.com>
parents: 593
diff changeset
287 ['<C-e>'] = { i = cmp.mapping.close() },
e8615fbcf11b Fix mappings for cmp
zegervdv <zegervdv@me.com>
parents: 593
diff changeset
288 ['<CR>'] = { i = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace } },
e8615fbcf11b Fix mappings for cmp
zegervdv <zegervdv@me.com>
parents: 593
diff changeset
289 ['<C-k>'] = { i = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace } },
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
290 },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
291 sources = {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
292 { name = 'nvim_lsp' },
557
bb1e1f4320d5 Add signature help completion
zegervdv <zegervdv@me.com>
parents: 555
diff changeset
293 { name = 'nvim_lsp_signature_help' },
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
294 { name = 'buffer', keyword_length = 5 },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
295 { name = 'luasnip' },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
296 { name = 'path' },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
297 },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
298 experimental = {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
299 native_menu = false,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
300 ghost_text = true,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
301 },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
302 }
518
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
303
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
304 cmp.setup.cmdline(':', {
594
e8615fbcf11b Fix mappings for cmp
zegervdv <zegervdv@me.com>
parents: 593
diff changeset
305 mapping = cmp.mapping.preset.cmdline {
e8615fbcf11b Fix mappings for cmp
zegervdv <zegervdv@me.com>
parents: 593
diff changeset
306 ['<C-p>'] = { c = cmp.mapping.select_prev_item() },
e8615fbcf11b Fix mappings for cmp
zegervdv <zegervdv@me.com>
parents: 593
diff changeset
307 ['<C-n>'] = { c = cmp.mapping.select_next_item() },
e8615fbcf11b Fix mappings for cmp
zegervdv <zegervdv@me.com>
parents: 593
diff changeset
308 ['<C-y>'] = { c = cmp.mapping.complete() },
e8615fbcf11b Fix mappings for cmp
zegervdv <zegervdv@me.com>
parents: 593
diff changeset
309 },
518
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
310 sources = cmp.config.sources({
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
311 { name = 'path' },
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
312 }, {
634
38a7bca2ba51 Add cmp-cmdline-history plugin to also complete history
zegervdv <zegervdv@me.com>
parents: 633
diff changeset
313 { name = 'cmdline_history' },
524
8d0846b75095 Only start completion at 4 chars on cmdline
zegervdv <zegervdv@me.com>
parents: 523
diff changeset
314 { name = 'cmdline', keyword_length = 4 },
518
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
315 }),
784b931c51b7 Enable cmp completion for cmdline
zegervdv <zegervdv@me.com>
parents: 517
diff changeset
316 })
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
317 end,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
318 after = 'luasnip',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
319 }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
320 use {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
321 {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
322 'nvim-treesitter/nvim-treesitter',
526
793a6f9bc2cf Automatically install Treesitter parsers
zegervdv <zegervdv@me.com>
parents: 525
diff changeset
323 run = ':TSUpdate',
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
324 config = function()
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
325 require 'nvim-treesitter.highlight'
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
326
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
327 require('nvim-treesitter.configs').setup {
525
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
328 ensure_installed = {
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
329 'python',
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
330 'lua',
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
331 'verilog',
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
332 'json',
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
333 'yaml',
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
334 'bash',
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
335 'dockerfile',
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
336 'c',
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
337 'cpp',
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
338 'regex',
623
5cceedc51955 Add cbfmt and markdown/rst tree sitters
zegervdv <zegervdv@me.com>
parents: 622
diff changeset
339 'markdown',
5cceedc51955 Add cbfmt and markdown/rst tree sitters
zegervdv <zegervdv@me.com>
parents: 622
diff changeset
340 'rst',
525
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
341 },
503
18c6eb4d5c71 Disable treesitter based highlighting for now (again)
Zeger Van de Vannet <zegervdv@me.com>
parents: 502
diff changeset
342 indent = {
18c6eb4d5c71 Disable treesitter based highlighting for now (again)
Zeger Van de Vannet <zegervdv@me.com>
parents: 502
diff changeset
343 enable = false,
18c6eb4d5c71 Disable treesitter based highlighting for now (again)
Zeger Van de Vannet <zegervdv@me.com>
parents: 502
diff changeset
344 },
496
8524c1a304a6 Enable tree-sitter highlights for systemverilog
zegervdv <zegervdv@me.com>
parents: 495
diff changeset
345 highlight = {
525
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
346 enable = true,
f01585f1517f Enable tree-sitter for some languages
zegervdv <zegervdv@me.com>
parents: 524
diff changeset
347 disable = { 'systemverilog', 'verilog' },
496
8524c1a304a6 Enable tree-sitter highlights for systemverilog
zegervdv <zegervdv@me.com>
parents: 495
diff changeset
348 },
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
349 incremental_selection = {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
350 enable = true,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
351 keymaps = {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
352 init_selection = 'gnn',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
353 node_incremental = 'grn',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
354 scope_incremental = 'grc',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
355 node_decremental = 'grm',
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
356 },
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
357 },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
358 refactor = {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
359 highlight_definitions = { enable = true },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
360 smart_rename = { enable = true, keymaps = { smart_rename = 'gsr' } },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
361 navigation = {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
362 enable = true,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
363 keymaps = { goto_definition = 'gnd', list_definitions = 'gnD' },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
364 },
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
365 },
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
366 textobjects = {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
367 move = {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
368 enable = true,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
369 goto_next_start = { [']]'] = '@block.outer' },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
370 goto_previous_start = { ['[['] = '@block.outer' },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
371 goto_next_end = { [']['] = '@block.outer' },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
372 goto_previous_end = { ['[]'] = '@block.outer' },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
373 },
500
c6624d04906a Add treesitter based textobjects
zegervdv <zegervdv@me.com>
parents: 499
diff changeset
374 select = {
c6624d04906a Add treesitter based textobjects
zegervdv <zegervdv@me.com>
parents: 499
diff changeset
375 enable = true,
c6624d04906a Add treesitter based textobjects
zegervdv <zegervdv@me.com>
parents: 499
diff changeset
376 lookahead = true,
c6624d04906a Add treesitter based textobjects
zegervdv <zegervdv@me.com>
parents: 499
diff changeset
377 keymaps = {
c6624d04906a Add treesitter based textobjects
zegervdv <zegervdv@me.com>
parents: 499
diff changeset
378 ['af'] = '@function.outer',
c6624d04906a Add treesitter based textobjects
zegervdv <zegervdv@me.com>
parents: 499
diff changeset
379 ['if'] = '@function.inner',
c6624d04906a Add treesitter based textobjects
zegervdv <zegervdv@me.com>
parents: 499
diff changeset
380 },
c6624d04906a Add treesitter based textobjects
zegervdv <zegervdv@me.com>
parents: 499
diff changeset
381 },
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
382 },
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
383 playground = { enable = true, disable = {}, updatetime = 25, persist_queries = false },
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
384 }
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
385 end,
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
386 },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
387 'nvim-treesitter/nvim-treesitter-refactor',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
388 'nvim-treesitter/nvim-treesitter-textobjects',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
389 { 'nvim-treesitter/playground', opt = true },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
390 }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
391 use { 'L3MON4D3/luasnip' }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
392 use {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
393 'rmagatti/goto-preview',
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
394 config = function() require('goto-preview').setup {} end,
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
395 }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
396 use {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
397 'jose-elias-alvarez/null-ls.nvim',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
398 requires = 'nvim-lua/plenary.nvim',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
399 }
570
c2cc785e1674 Add lsp-format plugin to format on save
zegervdv <zegervdv@me.com>
parents: 563
diff changeset
400 use {
c2cc785e1674 Add lsp-format plugin to format on save
zegervdv <zegervdv@me.com>
parents: 563
diff changeset
401 'lukas-reineke/lsp-format.nvim',
629
af14855ab067 disable formatting by sumneko_lua
zegervdv <zegervdv@me.com>
parents: 627
diff changeset
402 config = function() require('lsp-format').setup { exclude = { 'sumneko_lua' } } end,
570
c2cc785e1674 Add lsp-format plugin to format on save
zegervdv <zegervdv@me.com>
parents: 563
diff changeset
403 }
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
404 use { 'folke/lua-dev.nvim' }
599
1def7efdc619 Add trouble.nvim for diagnostics overview
Zeger Van de Vannet <zegervdv@me.com>
parents: 594
diff changeset
405 use {
601
837e6ed64a90 add inc-rename plugin
Zeger Van de Vannet <zegervdv@me.com>
parents: 600
diff changeset
406 'smjonas/inc-rename.nvim',
602
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
407 config = function()
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
408 require('inc_rename').setup {
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
409 post_hook = function(result)
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
410 local changed = {}
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
411 for uri, changes in pairs(result.changes or result.documentChanges) do
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
412 local bufnr = vim.uri_to_bufnr(uri)
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
413 for _, edits in ipairs(changes) do
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
414 table.insert(changed, {
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
415 bufnr = bufnr,
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
416 lnum = edits.range.start.line + 1,
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
417 col = edits.range.start.character + 1,
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
418 text = vim.api.nvim_buf_get_lines(bufnr, edits.range.start.line, edits.range.start.line + 1, false)[1],
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
419 })
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
420 end
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
421 end
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
422 vim.fn.setqflist(changed, 'r')
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
423 end,
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
424 }
31157c048f16 Load renamed locations into quickfix list
Zeger Van de Vannet <zegervdv@me.com>
parents: 601
diff changeset
425 end,
601
837e6ed64a90 add inc-rename plugin
Zeger Van de Vannet <zegervdv@me.com>
parents: 600
diff changeset
426 }
611
a879f63773a2 add fidget to show lsp server progress
Zeger Van de Vannet <zegervdv@me.com>
parents: 610
diff changeset
427 use {
a879f63773a2 add fidget to show lsp server progress
Zeger Van de Vannet <zegervdv@me.com>
parents: 610
diff changeset
428 'j-hui/fidget.nvim',
a879f63773a2 add fidget to show lsp server progress
Zeger Van de Vannet <zegervdv@me.com>
parents: 610
diff changeset
429 config = function()
a879f63773a2 add fidget to show lsp server progress
Zeger Van de Vannet <zegervdv@me.com>
parents: 610
diff changeset
430 require('fidget').setup {
a879f63773a2 add fidget to show lsp server progress
Zeger Van de Vannet <zegervdv@me.com>
parents: 610
diff changeset
431 text = {
a879f63773a2 add fidget to show lsp server progress
Zeger Van de Vannet <zegervdv@me.com>
parents: 610
diff changeset
432 spinner = 'dots',
a879f63773a2 add fidget to show lsp server progress
Zeger Van de Vannet <zegervdv@me.com>
parents: 610
diff changeset
433 },
a879f63773a2 add fidget to show lsp server progress
Zeger Van de Vannet <zegervdv@me.com>
parents: 610
diff changeset
434 window = {
a879f63773a2 add fidget to show lsp server progress
Zeger Van de Vannet <zegervdv@me.com>
parents: 610
diff changeset
435 relative = 'editor',
618
7d581ebd5508 disable blend on lsp progress
zegervdv <zegervdv@me.com>
parents: 617
diff changeset
436 blend = 0,
611
a879f63773a2 add fidget to show lsp server progress
Zeger Van de Vannet <zegervdv@me.com>
parents: 610
diff changeset
437 },
a879f63773a2 add fidget to show lsp server progress
Zeger Van de Vannet <zegervdv@me.com>
parents: 610
diff changeset
438 }
a879f63773a2 add fidget to show lsp server progress
Zeger Van de Vannet <zegervdv@me.com>
parents: 610
diff changeset
439 end,
a879f63773a2 add fidget to show lsp server progress
Zeger Van de Vannet <zegervdv@me.com>
parents: 610
diff changeset
440 }
631
6372f0542bed remove splice config
zegervdv <zegervdv@me.com>
parents: 629
diff changeset
441 use {
6372f0542bed remove splice config
zegervdv <zegervdv@me.com>
parents: 629
diff changeset
442 'https://git.sr.ht/~whynothugo/lsp_lines.nvim',
6372f0542bed remove splice config
zegervdv <zegervdv@me.com>
parents: 629
diff changeset
443 config = function()
6372f0542bed remove splice config
zegervdv <zegervdv@me.com>
parents: 629
diff changeset
444 require('lsp_lines').setup()
6372f0542bed remove splice config
zegervdv <zegervdv@me.com>
parents: 629
diff changeset
445 vim.diagnostic.config { virtual_lines = false, virtual_text = false }
6372f0542bed remove splice config
zegervdv <zegervdv@me.com>
parents: 629
diff changeset
446 vim.keymap.set('n', 'g?', function() require('lsp_lines').toggle() end, { desc = 'Toggle LSP diagnostic lines' })
6372f0542bed remove splice config
zegervdv <zegervdv@me.com>
parents: 629
diff changeset
447 end,
6372f0542bed remove splice config
zegervdv <zegervdv@me.com>
parents: 629
diff changeset
448 }
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
449
620
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
450 use {
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
451 'nvim-telescope/telescope-ui-select.nvim',
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
452 requires = { 'nvim-telescope/telescope.nvim' },
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
453 config = function()
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
454 require('telescope').setup {
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
455 defaults = {
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
456 border = {},
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
457 borderchars = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' },
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
458 winblend = 0,
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
459 },
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
460 extensions = {
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
461 ['ui-select'] = require('telescope.themes').get_dropdown {
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
462 border = {},
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
463 borderchars = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' },
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
464 winblend = 0,
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
465 },
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
466 },
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
467 }
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
468 require('telescope').load_extension 'ui-select'
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
469 end,
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
470 }
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
471
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
472 use { 'vimjas/vim-python-pep8-indent', ft = { 'python' } }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
473
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
474 use {
605
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
475 'rebelot/heirline.nvim',
610
864493b0506a make sure onedark is loaded to copy color settings from
zegervdv <zegervdv@me.com>
parents: 609
diff changeset
476 after = 'onedark.nvim',
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
477 config = function()
605
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
478 local utils = require 'heirline.utils'
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
479 local conditions = require 'heirline.conditions'
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
480
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
481 local colors = require('onedark.palette').dark
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
482 colors.diag_warn = utils.get_highlight('DiagnosticSignWarn').fg
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
483 colors.diag_error = utils.get_highlight('DiagnosticSignError').fg
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
484
605
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
485 require('heirline').load_colors(colors)
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
486
605
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
487 local align = { provider = '%=' }
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
488 local space = { provider = ' ' }
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
489 local lbound = { provider = '▊ ', hl = { fg = 'blue', bg = 'bg' } }
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
490 local rbound = { provider = ' ▊', hl = { fg = 'blue', bg = 'bg' } }
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
491
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
492 local FileNameBlock = {
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
493 init = function(self) self.filename = vim.api.nvim_buf_get_name(0) end,
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
494 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
495
605
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
496 local FileName = {
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
497 provider = function(self)
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
498 local filename = vim.fn.fnamemodify(self.filename, ':.')
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
499 if filename == '' then return '[No Name]' end
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
500
609
4d84c6c203f7 trim filename in statusline
zegervdv <zegervdv@me.com>
parents: 608
diff changeset
501 if not conditions.width_percent_below(#filename, 0.25) then filename = vim.fn.pathshorten(filename) end
4d84c6c203f7 trim filename in statusline
zegervdv <zegervdv@me.com>
parents: 608
diff changeset
502
605
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
503 return filename
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
504 end,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
505 hl = { fg = 'blue' },
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
506 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
507
605
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
508 local FileFlags = {
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
509 {
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
510 provider = function()
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
511 if vim.bo.modified then return ' [+]' end
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
512 end,
605
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
513 hl = { fg = 'green' },
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
514 },
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
515 {
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
516 provider = function()
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
517 if not vim.bo.modifiable or vim.bo.readonly then return ' RO' end
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
518 end,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
519 hl = { fg = 'orange' },
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
520 },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
521 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
522
605
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
523 FileNameBlock = utils.insert(FileNameBlock, FileName, unpack(FileFlags), { provider = '%<' })
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
524
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
525 local Ruler = { provider = '%l : %c %P' }
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
526
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
527 local Lsp = {
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
528 condition = conditions.lsp_attached,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
529 update = { 'LspAttach', 'LspDetach' },
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
530 provider = function()
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
531 local names = {}
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
532 for _, server in pairs(vim.lsp.get_active_clients { bufnr = 0 }) do
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
533 table.insert(names, server.name)
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
534 end
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
535 return table.concat(names, ', ')
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
536 end,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
537 hl = { fg = 'green' },
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
538 }
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
539
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
540 local Diagnostics = {
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
541 condition = conditions.has_diagnostics,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
542 init = function(self)
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
543 self.errors = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.ERROR })
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
544 self.warnings = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.WARN })
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
545 end,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
546 update = { 'DiagnosticChanged', 'BufEnter' },
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
547 {
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
548 provider = function(self) return self.errors > 0 and self.errors .. ' ' end,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
549 hl = { fg = 'diag_error' },
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
550 },
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
551 {
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
552 provider = function(self) return self.warnings > 0 and self.warnings .. ' ' end,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
553 },
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
554 hl = { fg = 'diag_warn' },
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
555 on_click = {
612
f6e88e1bfe13 use simple quickfix on clicking diagnostic info
zegervdv <zegervdv@me.com>
parents: 611
diff changeset
556 callback = function()
616
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
557 vim.diagnostic.setqflist { severity = { min = vim.diagnostic.severity.WARN } }
613
c79b392e7919 Use indexed vim.cmd
zegervdv <zegervdv@me.com>
parents: 612
diff changeset
558 vim.cmd.copen { mods = { split = 'botright' } }
612
f6e88e1bfe13 use simple quickfix on clicking diagnostic info
zegervdv <zegervdv@me.com>
parents: 611
diff changeset
559 end,
605
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
560 name = 'heirline_diagnostics',
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
561 },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
562 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
563
605
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
564 local statusline_default = { lbound, FileNameBlock, align, Diagnostics, Lsp, space, Ruler, rbound }
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
565 local statusline_inactive = {
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
566 condition = function() return not conditions.is_active() end,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
567 lbound,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
568 FileNameBlock,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
569 align,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
570 rbound,
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
571 }
605
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
572 local statusline = {
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
573 init = utils.pick_child_on_condition,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
574 hl = { bg = 'bg' },
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
575 statusline_inactive,
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
576 statusline_default,
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
577 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
578
605
2828b29de182 switch to heirline as status line
zegervdv <zegervdv@me.com>
parents: 604
diff changeset
579 require('heirline').setup(statusline)
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
580 end,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
581 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
582
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
583 -- File navigation
529
735fb9e8e6cb replace dirvish with dirbuf
zegervdv <zegervdv@me.com>
parents: 526
diff changeset
584 use {
735fb9e8e6cb replace dirvish with dirbuf
zegervdv <zegervdv@me.com>
parents: 526
diff changeset
585 'elihunter173/dirbuf.nvim',
735fb9e8e6cb replace dirvish with dirbuf
zegervdv <zegervdv@me.com>
parents: 526
diff changeset
586 opt = true,
735fb9e8e6cb replace dirvish with dirbuf
zegervdv <zegervdv@me.com>
parents: 526
diff changeset
587 config = function()
735fb9e8e6cb replace dirvish with dirbuf
zegervdv <zegervdv@me.com>
parents: 526
diff changeset
588 require('dirbuf').setup {
735fb9e8e6cb replace dirvish with dirbuf
zegervdv <zegervdv@me.com>
parents: 526
diff changeset
589 hash_padding = 2,
735fb9e8e6cb replace dirvish with dirbuf
zegervdv <zegervdv@me.com>
parents: 526
diff changeset
590 show_hidden = true,
735fb9e8e6cb replace dirvish with dirbuf
zegervdv <zegervdv@me.com>
parents: 526
diff changeset
591 }
735fb9e8e6cb replace dirvish with dirbuf
zegervdv <zegervdv@me.com>
parents: 526
diff changeset
592 end,
735fb9e8e6cb replace dirvish with dirbuf
zegervdv <zegervdv@me.com>
parents: 526
diff changeset
593 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
594
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
595 -- Colorscheme
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
596 use {
523
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
597 'navarasu/onedark.nvim',
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
598 config = function()
523
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
599 require('onedark').setup {
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
600 style = 'dark',
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
601 code_style = {
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
602 comments = 'italic',
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
603 },
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
604 ending_tildes = true,
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
605 diagnostics = {
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
606 darker = false,
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
607 undercurl = false,
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
608 background = false,
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
609 },
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
610 }
d6b4520b8257 Replace colorscheme with onedark.nvim
zegervdv <zegervdv@me.com>
parents: 522
diff changeset
611 require('onedark').load()
620
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
612 local extras = {
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
613 TelescopeNormal = { link = 'Pmenu' },
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
614 TelescopeBorder = { link = 'Pmenu' },
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
615 TelescopePromptBorder = { link = 'Pmenu' },
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
616 TelescopePreviewBorder = { link = 'Pmenu' },
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
617 TelescopeResultsBorder = { link = 'Pmenu' },
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
618 TelescopeTitle = { link = 'identifier' },
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
619 }
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
620 for name, opt in pairs(extras) do
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
621 vim.api.nvim_set_hl(0, name, opt)
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
622 end
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
623 end,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
624 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
625
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
626 -- Terminal
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
627 use {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
628 'akinsho/nvim-toggleterm.lua',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
629 config = function()
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
630 require('toggleterm').setup {
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
631 size = 15,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
632 open_mapping = [[<F12>]],
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
633 shade_filetypes = { 'none' },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
634 shade_terminals = true,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
635 persist_size = true,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
636 direction = 'horizontal',
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
637 }
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
638 end,
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
639 keys = { [[<F12>]] },
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
640 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
641
487
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
642 -- Filetypes
0252f9494d64 Remove deferred loading of packer plugins
Zeger Van de Vannet <zegervdv@me.com>
parents: 486
diff changeset
643 use { 'lepture/vim-jinja' }
577
50e9c21e8e95 Add firenvim
zegervdv <zegervdv@me.com>
parents: 574
diff changeset
644
582
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
645 -- Integration with external tools
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
646 use {
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
647 'glacambre/firenvim',
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
648 run = function() vim.fn['firenvim#install'](0) end,
582
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
649 config = function()
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
650 vim.g.firenvim_config = {
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
651 localSettings = {
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
652 ['.*'] = {
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
653 takeover = 'never',
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
654 },
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
655 },
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
656 }
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
657 end,
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
658 }
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
659 end)
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
660
613
c79b392e7919 Use indexed vim.cmd
zegervdv <zegervdv@me.com>
parents: 612
diff changeset
661 vim.cmd.packadd 'dirbuf.nvim'
519
d919c1590230 Move dirvish loading to init.lua
zegervdv <zegervdv@me.com>
parents: 518
diff changeset
662
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
663 -- Configuration
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
664 local opt = vim.opt
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
665
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
666 opt.backspace = { 'indent', 'eol', 'start' } -- Backspace everything
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
667
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
668 opt.autoread = true -- Read changed files
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
669 opt.hidden = true -- Allow to move away from modified files
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
670 opt.autowriteall = true -- Write changes when losing focus
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
671
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
672 -- Visuals
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
673 opt.number = true
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
674 opt.relativenumber = true
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
675 opt.scrolloff = 4
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
676 opt.showcmd = true -- Show incomplete commands while typing
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
677
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
678 opt.termguicolors = true
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
679 opt.background = 'dark'
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
680
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
681 opt.showmatch = true -- Highligh matching braces
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
682
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
683 opt.wrap = true -- Wrap lines
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
684 opt.wrapmargin = 2 -- Stay 2 chars from side
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
685 opt.textwidth = 79
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
686 opt.colorcolumn = '81' -- Show indication of 81 chars
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
687 opt.linebreak = true -- Smarter wrapping
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
688 opt.breakindent = true -- Indent wrapped lines to same level
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
689
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
690 opt.fixendofline = true -- Add EOL when missing
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
691
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
692 opt.expandtab = true -- Add spaces when pressing tab
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
693 opt.tabstop = 2 -- Tab is 2 spaces
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
694 opt.shiftwidth = 2 -- Shift per 2 spaces
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
695 opt.shiftround = true -- Round shifts to allign (1 space + tab = 2 spaces)
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 -- Searching and substitute
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
698 opt.magic = true -- Enable regexes
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
699 opt.hlsearch = true -- Highlight all matches
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
700 opt.incsearch = true -- Show matches while typing
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
701 opt.ignorecase = true
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
702 opt.smartcase = true -- When search pattern contains cases, be case sensitive
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
703 opt.gdefault = true -- Use global flag for substitute: replace all matches on line
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
704 opt.inccommand = 'nosplit' -- Show live replacements directly in text
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
705
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
706 opt.autoindent = true
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
707 opt.cindent = true -- C-syntax based indenting
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
708
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
709 opt.updatetime = 300 -- Faster triggering of CursorHold events
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
710
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
711 opt.errorbells = false -- Don't you beep to me
541
80622cb35a3e do not set title from nvim
zegervdv <zegervdv@me.com>
parents: 532
diff changeset
712 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
713
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
714 opt.history = 1000 -- Remember last commands
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
715
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
716 opt.wildmenu = true -- Command completion
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
717 opt.wildmode = 'longest:full,full'
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
718 opt.shortmess:append 'c' -- Hide ins-completion messages
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
719
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
720 opt.ttyfast = true -- fast terminal
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
721 opt.lazyredraw = true
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
722 opt.ttimeoutlen = -1 -- Minimum timeout
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
723
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
724 opt.diffopt:append 'iwhite' -- Ignore whitespace in diffs
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
725 opt.diffopt:append 'internal' -- Internal diff engine
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
726 opt.diffopt:append 'algorithm:patience' -- Use patience algorithm
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
727
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
728 opt.tags = { '.git/tags', 'tags' }
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
729
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
730 opt.path:append '**' -- Recursively search current directory
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
731
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
732 opt.formatoptions = {
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
733 c = true, -- Wrap comments
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
734 r = true, -- Continue comments
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
735 o = true, -- Insert comment with o/O
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
736 q = true, -- Format comments with gq
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
737 n = true, -- Indent numbered lists
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
738 [2] = true, -- Indent from 2nd line of paragraph
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
739 [1] = true, -- Don't break before one letter words
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
740 }
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
741
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
742 opt.signcolumn = 'yes' -- Always show signcolumn
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
743
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
744 opt.cursorline = true
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
745
543
15d6c097f1c9 set nostartofline to keep cursor in same column when scrolling
zegervdv <zegervdv@me.com>
parents: 541
diff changeset
746 opt.startofline = false -- When moving try to keep cursor in column
15d6c097f1c9 set nostartofline to keep cursor in same column when scrolling
zegervdv <zegervdv@me.com>
parents: 541
diff changeset
747
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
748 -- Show certain characters
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
749 opt.list = true
485
4ad3b5ada36b Add listchar for tab (fixes ^I in text)
zegervdv <zegervdv@me.com>
parents: 484
diff changeset
750 opt.listchars = { trail = '·', extends = '>', precedes = '<', nbsp = '+', tab = '▸ ' }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
751
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
752 opt.sessionoptions:remove 'options' -- Remove options from saved sessions (reload from config)
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
753
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
754 opt.completeopt = { 'menu', 'menuone', 'noselect' }
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
755
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
756 opt.splitright = true -- Open new splits to right
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
757 opt.virtualedit = 'block' -- Enable block editting
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
758
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
759 opt.conceallevel = 0 -- Disable conceal
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
760
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
761 opt.pastetoggle = '<F2>' -- Enable paste mode
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
762
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
763 opt.undofile = true -- Persistently remember undos
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
764 opt.undolevels = 1000
579
4e25c3d4470d handle HOME on windows
zegervdv <zegervdv@me.com>
parents: 577
diff changeset
765 opt.undodir = home .. '/.config/nvim/tmp/undo//'
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
766 opt.swapfile = false -- Disable swap files
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
767 opt.backup = true -- Keep backups
579
4e25c3d4470d handle HOME on windows
zegervdv <zegervdv@me.com>
parents: 577
diff changeset
768 opt.backupdir = home .. '/.config/nvim/tmp/backup//'
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
769
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
770 -- Files to ignore from completion
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
771 opt.wildignore:append {
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
772 '*/tmp/*',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
773 '*.so',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
774 '*.swp',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
775 '*.zip',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
776 '*.o',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
777 '*.bin',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
778 '*.elf',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
779 '*.hex',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
780 '*.eps',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
781 '.git/*',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
782 '*.dup',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
783 '.hg/**',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
784 '*.orig',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
785 '*.*~',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
786 }
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
787
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
788 opt.mouse = {
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
789 n = true, -- Normal mode
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
790 i = true, -- Insert mode
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
791 c = true, -- Commandline mode
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
792 }
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
793
616
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
794 opt.fillchars:append {
606
3fb4fbf5fde2 add diff fillchar
zegervdv <zegervdv@me.com>
parents: 605
diff changeset
795 diff = '╱',
3fb4fbf5fde2 add diff fillchar
zegervdv <zegervdv@me.com>
parents: 605
diff changeset
796 }
3fb4fbf5fde2 add diff fillchar
zegervdv <zegervdv@me.com>
parents: 605
diff changeset
797
633
9f040a50eac8 add view to jumpoptions to preserve view when mark was set
zegervdv <zegervdv@me.com>
parents: 632
diff changeset
798 opt.jumpoptions:append { 'view' }
9f040a50eac8 add view to jumpoptions to preserve view when mark was set
zegervdv <zegervdv@me.com>
parents: 632
diff changeset
799
463
1d2e33dfe0c6 Clean up folding and foldtexts
zegervdv <zegervdv@me.com>
parents: 462
diff changeset
800 opt.foldmethod = 'expr'
1d2e33dfe0c6 Clean up folding and foldtexts
zegervdv <zegervdv@me.com>
parents: 462
diff changeset
801 opt.foldexpr = 'nvim_treesitter#foldexpr()'
1d2e33dfe0c6 Clean up folding and foldtexts
zegervdv <zegervdv@me.com>
parents: 462
diff changeset
802 opt.foldnestmax = 3
1d2e33dfe0c6 Clean up folding and foldtexts
zegervdv <zegervdv@me.com>
parents: 462
diff changeset
803 opt.foldminlines = 1
1d2e33dfe0c6 Clean up folding and foldtexts
zegervdv <zegervdv@me.com>
parents: 462
diff changeset
804 opt.foldtext =
1d2e33dfe0c6 Clean up folding and foldtexts
zegervdv <zegervdv@me.com>
parents: 462
diff changeset
805 [[substitute(getline(v:foldstart),'\\t',repeat('\ ',&tabstop),'g').'...'.trim(getline(v:foldend)) . ' (' . (v:foldend - v:foldstart + 1) . ' lines)']]
1d2e33dfe0c6 Clean up folding and foldtexts
zegervdv <zegervdv@me.com>
parents: 462
diff changeset
806 opt.foldenable = false
1d2e33dfe0c6 Clean up folding and foldtexts
zegervdv <zegervdv@me.com>
parents: 462
diff changeset
807
616
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
808 function _G.qftf(info)
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
809 local items
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
810 local ret = {}
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
811 if info.quickfix == 1 then
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
812 items = fn.getqflist({ id = info.id, items = 0 }).items
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
813 else
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
814 items = fn.getloclist(info.winid, { id = info.id, items = 0 }).items
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
815 end
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
816 local limit = 31
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
817 local fnameFmt1, fnameFmt2 = '%-' .. limit .. 's', '…%.' .. (limit - 1) .. 's'
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
818 local validFmt = '%s │%5d:%-3d│%s %s'
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
819 for i = info.start_idx, info.end_idx do
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
820 local e = items[i]
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
821 local fname = ''
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
822 local str
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
823 if e.valid == 1 then
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
824 if e.bufnr > 0 then
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
825 fname = fn.bufname(e.bufnr)
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
826 if fname == '' then
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
827 fname = '[No Name]'
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
828 else
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
829 fname = fname:gsub('^' .. vim.env.HOME, '~')
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
830 end
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
831 -- char in fname may occur more than 1 width, ignore this issue in order to keep performance
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
832 if #fname <= limit then
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
833 fname = fnameFmt1:format(fname)
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
834 else
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
835 fname = fnameFmt2:format(fname:sub(1 - limit))
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
836 end
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
837 end
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
838 local lnum = e.lnum > 99999 and -1 or e.lnum
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
839 local col = e.col > 999 and -1 or e.col
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
840 local qtype = e.type == '' and '' or ' ' .. e.type:sub(1, 1):upper()
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
841 str = validFmt:format(fname, lnum, col, qtype, e.text)
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
842 else
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
843 str = e.text
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
844 end
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
845 table.insert(ret, str)
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
846 end
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
847 return ret
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
848 end
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
849
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
850 vim.o.qftf = '{info -> v:lua._G.qftf(info)}'
08bb1c92e5e5 Add cleaner quickfix
zegervdv <zegervdv@me.com>
parents: 615
diff changeset
851
520
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
852 -- Clean up terminal codes from strings
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
853 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
854
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
855 -- General keymaps
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
856 local map = vim.keymap.set
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
857
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
858 -- Set leader to space
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
859 map({ 'n', 'v', 'i', 'x' }, '<space>', '<leader>', { remap = true })
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
860
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
861 -- Move while in insert mode
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
862 map('i', '<C-f>', '<right>')
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
863
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
864 -- Keep search matches centered
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
865 map('n', 'n', 'nzzzv')
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
866 map('n', 'N', 'Nzzzv')
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
867
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
868 -- Very magic search patterns
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
869 map({ 'n', 'v' }, '/', '/\\v')
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
870
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
871 -- Move through long lines as breaks
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
872 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
873 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
874
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
875 -- Command line search for commands
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
876 map('c', '<c-n>', '<down>')
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
877 map('c', '<c-p>', '<up>')
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
878
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
879 -- Clear highlighs
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
880 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
881
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
882 -- Reselect last selection
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
883 map('n', 'gV', '`[v`]')
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
884
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
885 -- Use backspace as normal in visual mode
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
886 map('v', '<BS>', 'x', { remap = true })
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
887
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
888 -- Keep selection when indenting
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
889 local keep_visual_selection = function(cmd)
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
890 return function()
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
891 vim.opt.smartindent = false
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
892 if vim.fn.mode() == 'V' then
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
893 return cmd .. t ':set smartindent<CR>gv'
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
894 else
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
895 return cmd .. t ':set smartindent<CR>'
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
896 end
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
897 end
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
898 end
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
899 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
900 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
901
574
8b04d5ffd210 Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents: 570
diff changeset
902 -- Do not move on *
8b04d5ffd210 Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents: 570
diff changeset
903 map('n', '*', function()
8b04d5ffd210 Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents: 570
diff changeset
904 local view = vim.fn.winsaveview()
613
c79b392e7919 Use indexed vim.cmd
zegervdv <zegervdv@me.com>
parents: 612
diff changeset
905 vim.cmd.normal { '*', bang = true }
574
8b04d5ffd210 Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents: 570
diff changeset
906 vim.fn.winrestview(view)
599
1def7efdc619 Add trouble.nvim for diagnostics overview
Zeger Van de Vannet <zegervdv@me.com>
parents: 594
diff changeset
907 end, {
1def7efdc619 Add trouble.nvim for diagnostics overview
Zeger Van de Vannet <zegervdv@me.com>
parents: 594
diff changeset
908 silent = true,
1def7efdc619 Add trouble.nvim for diagnostics overview
Zeger Van de Vannet <zegervdv@me.com>
parents: 594
diff changeset
909 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
910 })
574
8b04d5ffd210 Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents: 570
diff changeset
911
627
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
912 map('x', 'p', [[ p:if v:register == '"'<Bar>let @@=@0<Bar>endif<CR> ]], { silent = true })
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
913
574
8b04d5ffd210 Clean up unused functions and mappings
zegervdv <zegervdv@me.com>
parents: 570
diff changeset
914 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
915 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
916 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
917 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
918
627
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
919 map('t', '<C-h>', '<C-\\><C-n><C-w>h')
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
920 map('t', '<C-j>', '<C-\\><C-n><C-w>j')
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
921 map('t', '<C-k>', '<C-\\><C-n><C-w>k')
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
922 map('t', '<C-l>', '<C-\\><C-n><C-w>l')
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
923
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
924 map('c', '<CR>', function()
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
925 local cmdline = vim.fn.getcmdline()
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
926 print(cmdline)
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
927 if cmdline == 'ls' or cmdline == 'buffers' or cmdline == 'files' then return '<CR>:b' end
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
928 return '<CR>'
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
929 end, { expr = true })
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
930
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
931 -- Special highlighting
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
932 vim.cmd.match { 'ErrorMsg', [[ '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$' ]] }
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
933
489
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
934 local au = require 'au'
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
935
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
936 -- Highlight yanked text
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
937 au.TextYankPost = function() vim.highlight.on_yank { timeout = 120 } end
489
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
938
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
939 -- Automatic cursorline
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
940 au.group('cline', {
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
941 {
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
942 'WinEnter',
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
943 '*',
620
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
944 function()
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
945 print(vim.bo.buftype)
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
946 if vim.bo.buftype ~= 'nofile' then vim.opt_local.cursorline = true end
15c9da15a2f5 add telescope for vim.ui.select
zegervdv <zegervdv@me.com>
parents: 619
diff changeset
947 end,
489
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
948 },
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
949 {
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
950 'WinLeave',
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
951 '*',
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
952 function() vim.opt_local.cursorline = false end,
489
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
953 },
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
954 })
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
955
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
956 -- Save files on focus lost
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
957 au.FocusLost = function()
613
c79b392e7919 Use indexed vim.cmd
zegervdv <zegervdv@me.com>
parents: 612
diff changeset
958 if not vim.o.readonly and vim.api.nvim_buf_get_name(0) ~= '' then vim.cmd.wa() end
489
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
959 end
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
960
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
961 -- Equalize splits after resizing
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
962 au.VimResized = [[ exe "normal! \<c-w>=" ]]
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
963
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
964 -- Reload diffs after editing
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
965 au.BufWritePost = function()
613
c79b392e7919 Use indexed vim.cmd
zegervdv <zegervdv@me.com>
parents: 612
diff changeset
966 if vim.o.diff then vim.cmd.diffupdate() end
489
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
967 end
1635e29e0ed4 Move autocmds to init.lua
zegervdv <zegervdv@me.com>
parents: 488
diff changeset
968
627
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
969 -- Terminal
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
970 au.group('enter_term', {
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
971 { 'TermOpen', '*', 'startinsert!' },
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
972 {
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
973 'BufEnter',
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
974 '*',
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
975 function()
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
976 if vim.bo.buftype == 'terminal' then vim.cmd.startinsert { bang = true } end
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
977 end,
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
978 },
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
979 {
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
980 'BufLeave',
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
981 '*',
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
982 function()
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
983 if vim.bo.buftype == 'terminal' then vim.cmd.stopinsert { bang = true } end
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
984 end,
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
985 },
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
986 })
a2a5862a3bd3 convert more vimscript to lua
zegervdv <zegervdv@me.com>
parents: 625
diff changeset
987
558
3ac8dac65b1b Add luasnip expansion mappings
zegervdv <zegervdv@me.com>
parents: 557
diff changeset
988 -- Snippets
3ac8dac65b1b Add luasnip expansion mappings
zegervdv <zegervdv@me.com>
parents: 557
diff changeset
989 local ls = require 'luasnip'
3ac8dac65b1b Add luasnip expansion mappings
zegervdv <zegervdv@me.com>
parents: 557
diff changeset
990 -- Expand snippet or jump to next placeholder
3ac8dac65b1b Add luasnip expansion mappings
zegervdv <zegervdv@me.com>
parents: 557
diff changeset
991 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
992 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
993 end, {
6f07ecae3810 Create Ag command in config step
Zeger Van de Vannet <zegervdv@me.com>
parents: 560
diff changeset
994 silent = true,
6f07ecae3810 Create Ag command in config step
Zeger Van de Vannet <zegervdv@me.com>
parents: 560
diff changeset
995 })
558
3ac8dac65b1b Add luasnip expansion mappings
zegervdv <zegervdv@me.com>
parents: 557
diff changeset
996
3ac8dac65b1b Add luasnip expansion mappings
zegervdv <zegervdv@me.com>
parents: 557
diff changeset
997 -- Go back to previous placeholder
3ac8dac65b1b Add luasnip expansion mappings
zegervdv <zegervdv@me.com>
parents: 557
diff changeset
998 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
999 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
1000 end, {
6f07ecae3810 Create Ag command in config step
Zeger Van de Vannet <zegervdv@me.com>
parents: 560
diff changeset
1001 silent = true,
6f07ecae3810 Create Ag command in config step
Zeger Van de Vannet <zegervdv@me.com>
parents: 560
diff changeset
1002 })
558
3ac8dac65b1b Add luasnip expansion mappings
zegervdv <zegervdv@me.com>
parents: 557
diff changeset
1003
3ac8dac65b1b Add luasnip expansion mappings
zegervdv <zegervdv@me.com>
parents: 557
diff changeset
1004 -- Toggle options in snippets
3ac8dac65b1b Add luasnip expansion mappings
zegervdv <zegervdv@me.com>
parents: 557
diff changeset
1005 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
1006 if ls.choice_active() then ls.change_choice() end
558
3ac8dac65b1b Add luasnip expansion mappings
zegervdv <zegervdv@me.com>
parents: 557
diff changeset
1007 end)
3ac8dac65b1b Add luasnip expansion mappings
zegervdv <zegervdv@me.com>
parents: 557
diff changeset
1008
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1009 -- LSP config
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1010 local lsp = require 'lspconfig'
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1011 local null_ls = require 'null-ls'
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1012
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1013 local on_attach = function(client)
570
c2cc785e1674 Add lsp-format plugin to format on save
zegervdv <zegervdv@me.com>
parents: 563
diff changeset
1014 require('lsp-format').on_attach(client)
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
1015 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
1016
555
3b9c7a3a068a always enable lsp keymaps on attach
zegervdv <zegervdv@me.com>
parents: 543
diff changeset
1017 vim.bo.tagfunc = 'v:lua.vim.lsp.tagfunc'
3b9c7a3a068a always enable lsp keymaps on attach
zegervdv <zegervdv@me.com>
parents: 543
diff changeset
1018 nmap('gp', require('goto-preview').goto_preview_definition, { silent = true, buffer = 0 })
3b9c7a3a068a always enable lsp keymaps on attach
zegervdv <zegervdv@me.com>
parents: 543
diff changeset
1019 nmap('gP', require('goto-preview').close_all_win, { silent = true, buffer = 0 })
462
676d7ef5fecb Use tagfunc to query LSP for definitions
zegervdv <zegervdv@me.com>
parents: 460
diff changeset
1020
520
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
1021 nmap('gd', vim.lsp.buf.declaration, { silent = true, buffer = 0 })
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
1022 nmap('K', vim.lsp.buf.hover, { silent = true, buffer = 0 })
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
1023 nmap('gD', vim.lsp.buf.implementation, { silent = true, buffer = 0 })
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
1024 nmap('1gD', vim.lsp.buf.type_definition, { silent = true, buffer = 0 })
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
1025 nmap('gr', vim.lsp.buf.references, { silent = true, buffer = 0 })
f845e2eba7e3 Use new keymap lua function to set keymaps
zegervdv <zegervdv@me.com>
parents: 519
diff changeset
1026 nmap('g0', vim.lsp.buf.document_symbol, { silent = true, buffer = 0 })
621
817d54660c4f map ga to code-action
zegervdv <zegervdv@me.com>
parents: 620
diff changeset
1027 nmap('ga', vim.lsp.buf.code_action, { silent = true, buffer = 0 })
513
2476af02ba12 Use lsp tagfunc and formatexpr
zegervdv <zegervdv@me.com>
parents: 512
diff changeset
1028
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
1029 nmap('<c-p>', function() require('lsp-format').format() end, {
555
3b9c7a3a068a always enable lsp keymaps on attach
zegervdv <zegervdv@me.com>
parents: 543
diff changeset
1030 silent = true,
3b9c7a3a068a always enable lsp keymaps on attach
zegervdv <zegervdv@me.com>
parents: 543
diff changeset
1031 buffer = 0,
3b9c7a3a068a always enable lsp keymaps on attach
zegervdv <zegervdv@me.com>
parents: 543
diff changeset
1032 })
513
2476af02ba12 Use lsp tagfunc and formatexpr
zegervdv <zegervdv@me.com>
parents: 512
diff changeset
1033
555
3b9c7a3a068a always enable lsp keymaps on attach
zegervdv <zegervdv@me.com>
parents: 543
diff changeset
1034 vim.bo.formatexpr = 'v:lua.vim.lsp.formatexpr()'
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1035
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1036 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
1037 vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(vim.lsp.handlers.hover, { border = 'single' })
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1038 end
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1039
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1040 local capabilities = vim.lsp.protocol.make_client_capabilities()
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1041 capabilities.textDocument.completion.completionItem.snippetSupport = true
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1042 capabilities.textDocument.completion.completionItem.resolveSupport = {
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1043 properties = {
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1044 'documentation',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1045 'detail',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1046 'additionalTextEdits',
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1047 },
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1048 }
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1049 capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1050
532
e932c2076dba Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents: 529
diff changeset
1051 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
1052
e932c2076dba Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents: 529
diff changeset
1053 lsp.pyright.setup { on_attach = on_attach, capabilities = capabilities, root_dir = root_dir }
e932c2076dba Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents: 529
diff changeset
1054
e932c2076dba Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents: 529
diff changeset
1055 lsp.esbonio.setup {
e932c2076dba Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents: 529
diff changeset
1056 on_attach = on_attach,
e932c2076dba Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents: 529
diff changeset
1057 capabilities = capabilities,
e932c2076dba Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents: 529
diff changeset
1058 root_dir = root_dir,
e932c2076dba Add esbonio language server for sphinx docs
Zeger Van de Vannet <zegervdv@me.com>
parents: 529
diff changeset
1059 -- Assume esbonio is installed with --user
579
4e25c3d4470d handle HOME on windows
zegervdv <zegervdv@me.com>
parents: 577
diff changeset
1060 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
1061 }
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1062
581
ea43c828daa1 Add clangd config
Zeger Van de Vannet <zegervdv@me.com>
parents: 579
diff changeset
1063 lsp.clangd.setup {
ea43c828daa1 Add clangd config
Zeger Van de Vannet <zegervdv@me.com>
parents: 579
diff changeset
1064 on_attach = on_attach,
ea43c828daa1 Add clangd config
Zeger Van de Vannet <zegervdv@me.com>
parents: 579
diff changeset
1065 capabilities = capabilities,
ea43c828daa1 Add clangd config
Zeger Van de Vannet <zegervdv@me.com>
parents: 579
diff changeset
1066 root_dir = root_dir,
ea43c828daa1 Add clangd config
Zeger Van de Vannet <zegervdv@me.com>
parents: 579
diff changeset
1067 }
ea43c828daa1 Add clangd config
Zeger Van de Vannet <zegervdv@me.com>
parents: 579
diff changeset
1068
512
fc7a15e47e72 update null-ls config to remove lspconfig dependency
zegervdv <zegervdv@me.com>
parents: 511
diff changeset
1069 null_ls.setup {
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1070 sources = {
607
9a7fe4a97873 wrap lines at 100 chars with black
Zeger Van de Vannet <zegervdv@me.com>
parents: 606
diff changeset
1071 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
1072 null_ls.builtins.formatting.stylua,
623
5cceedc51955 Add cbfmt and markdown/rst tree sitters
zegervdv <zegervdv@me.com>
parents: 622
diff changeset
1073 null_ls.builtins.formatting.cbfmt,
502
6b6da9305782 Enable shellcheck via null-ls
zegervdv <zegervdv@me.com>
parents: 500
diff changeset
1074 null_ls.builtins.diagnostics.shellcheck,
509
80b42722bfa8 Add prettier formatting to null-ls
zegervdv <zegervdv@me.com>
parents: 503
diff changeset
1075 null_ls.builtins.formatting.prettier,
622
0c51221d3952 Add gitrebase code action
zegervdv <zegervdv@me.com>
parents: 621
diff changeset
1076 null_ls.builtins.code_actions.gitrebase,
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1077 },
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1078 on_attach = on_attach,
512
fc7a15e47e72 update null-ls config to remove lspconfig dependency
zegervdv <zegervdv@me.com>
parents: 511
diff changeset
1079 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
1080 }
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1081
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1082 local luadev = require('lua-dev').setup {
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1083 lspconfig = {
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1084 cmd = { 'lua-language-server' },
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1085 on_attach = on_attach,
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1086 capabilities = capabilities,
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1087 settings = {
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1088 Lua = {
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1089 diagnostics = {
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1090 globals = { 'use' },
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1091 },
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1092 },
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1093 },
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1094 },
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1095 }
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1096
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1097 lsp.sumneko_lua.setup(luadev)
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1098
582
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
1099 local fd_quickfix = function(args)
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
1100 local grepprg = vim.opt.grepprg
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
1101 local grepformat = vim.opt.grepformat
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
1102
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
1103 vim.opt.grepprg = 'fd'
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
1104 vim.opt.grepformat = '%f'
613
c79b392e7919 Use indexed vim.cmd
zegervdv <zegervdv@me.com>
parents: 612
diff changeset
1105 vim.cmd.execute('"silent! grep! ' .. args.args .. '"')
c79b392e7919 Use indexed vim.cmd
zegervdv <zegervdv@me.com>
parents: 612
diff changeset
1106 vim.cmd.copen()
582
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
1107
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
1108 vim.opt.grepprg = grepprg
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
1109 vim.opt.grepformat = grepformat
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
1110 end
589
6bb59cb7cdd4 update nvim api for 0.7
zegervdv <zegervdv@me.com>
parents: 585
diff changeset
1111 vim.api.nvim_create_user_command('Cfd', fd_quickfix, { nargs = '+', complete = 'file' })
582
8d5873878bb8 Add Cfd command to search files
zegervdv <zegervdv@me.com>
parents: 581
diff changeset
1112
466
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1113 vim.diagnostic.config {
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1114 underline = true,
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1115 update_in_insert = false,
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1116 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
1117 severity_sort = true,
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1118 }
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1119
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1120 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
1121 vim.fn.sign_define('DiagnosticSignWarn', {
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1122 texthl = 'DiagnosticSignWarn',
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1123 linehl = '',
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1124 numhl = '',
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1125 text = '▎',
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1126 })
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1127 vim.fn.sign_define('DiagnosticSignInfo', {
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1128 texthl = 'DiagnosticSignInfo',
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1129 linehl = '',
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1130 numhl = '',
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1131 text = '▎',
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1132 })
899cded39cd3 Update Diagnostic highlighting after api changes
Zeger Van de Vannet <zegervdv@me.com>
parents: 465
diff changeset
1133 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
1134
451
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1135 -- Try importing local config
d99353d71702 Use common template for windows nvim config
zegervdv <zegervdv@me.com>
parents:
diff changeset
1136 local ok, localconfig = pcall(require, 'localconfig')
600
24b0dd06381b Enable collapsed statements for stylua
Zeger Van de Vannet <zegervdv@me.com>
parents: 599
diff changeset
1137 if ok then localconfig.setup { on_attach = on_attach, capabilities = capabilities } end