Mercurial > dotfiles

annotate .chezmoitemplates/init.lua @ 702:fb751a7650e9

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