Mercurial > dotfiles

annotate .chezmoitemplates/init.lua @ 764:9e036614a6d8

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