annotate dot_config/nvim/config.lua @ 410:7c7feeaa3058

Install global stylua config
author zegervdv <zegervdv@me.com>
date Sat, 17 Jul 2021 11:42:57 +0200
parents f0300cd1584c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
1 --
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
2 -- Neovim dotfiles
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
3 --
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
4 --
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
5 local execute = vim.api.nvim_command
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
6 local fn = vim.fn
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
7
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
8 -- Bootstrap package manager
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
9 local install_path = fn.stdpath 'data' .. '/site/pack/packer/opt/packer.nvim'
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
10
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
11 if fn.empty(fn.glob(install_path)) > 0 then
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
12 execute('!git clone https://github.com/wbthomason/packer.nvim ' .. install_path)
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
13 end
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
14
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
15 vim.defer_fn(function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
16 -- Packer configuration is compiled and only needs to be loaded on changes
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
17 vim.cmd 'packadd packer.nvim'
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
18
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
19 require('packer').startup(function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
20 use { 'wbthomason/packer.nvim', opt = true }
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
21
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
22 -- General plugins
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
23 use { 'tpope/vim-sensible' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
24 use { 'tpope/vim-repeat' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
25 use { 'tpope/vim-rsi' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
26 use { 'sgur/vim-editorconfig' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
27 use { 'ShikChen/osc52.vim' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
28 use { 'einfachtoll/didyoumean' }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
29
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
30 use { 'tpope/vim-obsession' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
31 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
32 'tpope/vim-eunuch',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
33 cmd = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
34 'Delete',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
35 'Unlink',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
36 'Move',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
37 'Rename',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
38 'Mkdir',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
39 'Chmod',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
40 'Cfind',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
41 'Clocate',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
42 'Lfind',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
43 'Llocate',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
44 'SudoEdit',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
45 'SudoWrite',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
46 'Wall',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
47 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
48 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
49
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
50 use { 'psliwka/vim-smoothie' }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
51
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
52 use { 'nvim-lua/plenary.nvim' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
53
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
54 -- Spelling/autocorrection
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
55 use { 'tpope/vim-abolish' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
56
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
57 -- Git/VCS
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
58 use { 'vim-scripts/gitignore' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
59 use { 'sjl/splice.vim', opt = true, cmd = { 'SpliceInit' } }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
60 use { 'tpope/vim-git' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
61
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
62 -- Comments
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
63 use { 'b3nj5m1n/kommentary' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
64
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
65 -- Undoing
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
66 use { 'sjl/gundo.vim', cmd = { 'GundoToggle' } }
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
67
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
68 -- Parentheses etc
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
69 use { 'tpope/vim-surround' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
70 use { 'raimondi/delimitMate' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
71
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
72 -- Moving around within lines
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
73 use { 'wellle/targets.vim', event = 'InsertEnter *' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
74
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
75 -- Searching
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
76 use { 'mhinz/vim-grepper', cmd = { 'Grepper' } }
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
77
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
78 -- Keymaps TODO: to be removed when #13823 is merged
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
79 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
80 'tjdevries/astronauta.nvim',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
81 config = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
82 require 'astronauta.keymap'
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
83 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
84 }
401
7948403a514c Add plenary for local config scripts
Zeger Van de Vannet <zegervdv@me.com>
parents: 400
diff changeset
85
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
86 -- Opening files
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
87 use { 'wsdjeg/vim-fetch' }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
88
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
89 -- Indent lines
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
90 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
91 'lukas-reineke/indent-blankline.nvim',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
92 config = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
93 vim.g.indent_blankline_buftype_exclude = { 'terminal', 'help', 'nofile' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
94 vim.g.indent_blankline_show_first_indent_level = false
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
95 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
96 }
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
97
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
98 -- Increment/decrement
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
99 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
100 'zegervdv/nrpattern.nvim',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
101 requires = 'tpope/vim-repeat',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
102 config = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
103 local nrpattern = require 'nrpattern'
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
104 local defaults = require 'nrpattern.default'
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
105
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
106 defaults[{ 'input', 'output' }] = { priority = 12, filetypes = { 'verilog', 'systemverilog' } }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
107 defaults[{ "'1", "'0" }] = { priority = 9, filetypes = { 'verilog', 'systemverilog' } }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
108
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
109 nrpattern.setup(defaults)
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
110 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
111 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
112
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
113 -- Tmux
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
114 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
115 'numtostr/navigator.nvim',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
116 config = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
117 require('Navigator').setup { auto_save = 'current', disable_on_zoom = true }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
118
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
119 local nnoremap = vim.keymap.nnoremap
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
120 nnoremap { '<c-h>', require('Navigator').left, silent = true }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
121 nnoremap { '<c-j>', require('Navigator').down, silent = true }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
122 nnoremap { '<c-k>', require('Navigator').up, silent = true }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
123 nnoremap { '<c-l>', require('Navigator').right, silent = true }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
124 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
125 requires = 'tjdevries/astronauta.nvim',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
126 after = 'astronauta.nvim',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
127 }
325
ce396166d009 Move packer setup in a function, load on demand
zegervdv <zegervdv@me.com>
parents: 324
diff changeset
128
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
129 -- Completion/snippets/LSP
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
130 use { 'neovim/nvim-lspconfig' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
131 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
132 'hrsh7th/nvim-compe',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
133 config = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
134 require('compe').setup {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
135 enabled = true,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
136 autocomplete = true,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
137 debug = false,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
138 min_length = 1,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
139 preselect = 'enable',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
140 throttle_time = 80,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
141 source_timeout = 1000,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
142 incomplete_delay = 400,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
143 max_abbr_width = 100,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
144 max_kind_width = 100,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
145 max_menu_width = 100,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
146 documentation = true,
399
59db83251de2 Add vim-fetch to open file patterns with linenrs/colnrs
zegervdv <zegervdv@me.com>
parents: 398
diff changeset
147
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
148 source = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
149 path = true,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
150 buffer = true,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
151 nvim_lsp = true,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
152 nvim_lua = true,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
153 spell = false,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
154 vsnip = true,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
155 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
156 }
371
1dfda47d5d9e Add more lua based plugins: lush, navigator, numb
zegervdv <zegervdv@me.com>
parents: 370
diff changeset
157
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
158 vim.cmd [[ inoremap <silent><expr> <C-y> compe#complete() ]]
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
159 vim.cmd [[ inoremap <silent><expr> <CR> compe#confirm({ 'keys': "\<Plug>delimitMateCR", 'mode': '' }) ]]
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
160 vim.cmd [[ inoremap <silent><expr> <C-e> compe#close('<C-e>') ]]
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
161 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
162 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
163 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
164 {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
165 'nvim-treesitter/nvim-treesitter',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
166 config = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
167 require 'nvim-treesitter.highlight'
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
168
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
169 require('nvim-treesitter.configs').setup {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
170 highlight = { enable = false },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
171 incremental_selection = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
172 enable = true,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
173 keymaps = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
174 init_selection = 'gnn',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
175 node_incremental = 'grn',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
176 scope_incremental = 'grc',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
177 node_decremental = 'grm',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
178 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
179 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
180 refactor = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
181 highlight_definitions = { enable = true },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
182 smart_rename = { enable = true, keymaps = { smart_rename = 'gsr' } },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
183 navigation = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
184 enable = true,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
185 keymaps = { goto_definition = 'gnd', list_definitions = 'gnD' },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
186 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
187 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
188 textobjects = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
189 move = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
190 enable = true,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
191 goto_next_start = { [']]'] = '@block.outer' },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
192 goto_previous_start = { ['[['] = '@block.outer' },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
193 goto_next_end = { [']['] = '@block.outer' },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
194 goto_previous_end = { ['[]'] = '@block.outer' },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
195 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
196 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
197 playground = { enable = true, disable = {}, updatetime = 25, persist_queries = false },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
198 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
199 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
200 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
201 'nvim-treesitter/nvim-treesitter-refactor',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
202 'nvim-treesitter/nvim-treesitter-textobjects',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
203 { 'nvim-treesitter/playground', opt = true },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
204 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
205 use { 'hrsh7th/vim-vsnip', requires = 'hrsh7th/vim-vsnip-integ' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
206 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
207 'glepnir/lspsaga.nvim',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
208 config = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
209 require('lspsaga').init_lsp_saga {}
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
210 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
211 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
212 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
213 'rmagatti/goto-preview',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
214 config = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
215 require('goto-preview').setup {}
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
216 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
217 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
218 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
219 'jose-elias-alvarez/null-ls.nvim',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
220 requires = 'nvim-lua/plenary.nvim',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
221 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
222 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
223 'folke/lua-dev.nvim',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
224 }
362
c2c870fb8095 Add nrpattern with config
zegervdv <zegervdv@me.com>
parents: 361
diff changeset
225
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
226 -- Vanity
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
227 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
228 'yamatsum/nvim-web-nonicons',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
229 requires = 'kyazdani42/nvim-web-devicons',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
230 config = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
231 require 'nvim-nonicons'
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
232 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
233 }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
234
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
235 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
236 'glepnir/galaxyline.nvim',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
237 branch = 'main',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
238 -- your statusline
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
239 config = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
240 local gl = require 'galaxyline'
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
241 local colors = require('galaxyline.theme').default
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
242 local condition = require 'galaxyline.condition'
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
243 local gls = gl.section
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
244
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
245 colors.bg = '#2C323C'
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
246
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
247 gls.left[1] = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
248 RainbowRed = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
249 provider = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
250 return '▊ '
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
251 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
252 highlight = { colors.blue, colors.bg },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
253 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
254 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
255
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
256 gls.left[2] = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
257 FileIcon = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
258 provider = 'FileIcon',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
259 condition = condition.buffer_not_empty,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
260 highlight = { require('galaxyline.provider_fileinfo').get_file_icon_color, colors.bg },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
261 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
262 }
346
d717168f424f Switch to nvim-compe for completion
zegervdv <zegervdv@me.com>
parents: 345
diff changeset
263
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
264 gls.left[3] = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
265 FileName = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
266 provider = 'FileName',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
267 condition = condition.buffer_not_empty,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
268 highlight = { colors.magenta, colors.bg, 'bold' },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
269 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
270 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
271
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
272 gls.right[1] = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
273 ShowLspClient = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
274 provider = 'GetLspClient',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
275 condition = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
276 local tbl = { ['dashboard'] = true, [''] = true }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
277 if tbl[vim.bo.filetype] then
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
278 return false
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
279 end
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
280 return true
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
281 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
282 icon = require('nvim-nonicons').get 'server' .. ' LSP:',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
283 highlight = { colors.green, colors.bg, 'bold' },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
284 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
285 }
370
5ffb0fd7b98d Move treesitter config into packer_compiled
zegervdv <zegervdv@me.com>
parents: 368
diff changeset
286
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
287 gls.right[2] = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
288 LineInfo = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
289 provider = 'LineColumn',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
290 separator = ' ',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
291 separator_highlight = { 'NONE', colors.bg },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
292 highlight = { colors.fg, colors.bg },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
293 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
294 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
295
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
296 gls.right[3] = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
297 PerCent = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
298 provider = 'LinePercent',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
299 separator = ' ',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
300 separator_highlight = { 'NONE', colors.bg },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
301 highlight = { colors.fg, colors.bg, 'bold' },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
302 },
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
303 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
304 gls.right[8] = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
305 RainbowBlue = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
306 provider = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
307 return ' ▊'
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
308 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
309 highlight = { colors.blue, colors.bg },
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
310 },
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
311 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
312
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
313 gls.short_line_left[1] = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
314 BufferType = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
315 provider = 'FileTypeName',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
316 separator = ' ',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
317 separator_highlight = { 'NONE', colors.bg },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
318 highlight = { colors.blue, colors.bg, 'bold' },
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
319 },
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
320 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
321
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
322 gls.short_line_left[2] = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
323 SFileName = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
324 provider = 'SFileName',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
325 condition = condition.buffer_not_empty,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
326 highlight = { colors.fg, colors.bg, 'bold' },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
327 },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
328 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
329
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
330 gls.short_line_right[1] = {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
331 BufferIcon = { provider = 'BufferIcon', highlight = { colors.fg, colors.bg } },
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
332 }
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
333 end,
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
334 }
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
335
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
336 -- File navigation
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
337 use { 'justinmk/vim-dirvish' }
361
337eb27fc66e Add galaxyline for statusline
zegervdv <zegervdv@me.com>
parents: 357
diff changeset
338
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
339 -- Colorscheme
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
340 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
341 'zegervdv/one-lush',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
342 requires = 'rktjmp/lush.nvim',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
343 config = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
344 require 'lush_theme.one-lush'
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
345 vim.cmd [[ colorscheme one-lush ]]
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
346 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
347 }
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
348
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
349 -- Terminal
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
350 use {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
351 'akinsho/nvim-toggleterm.lua',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
352 config = function()
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
353 require('toggleterm').setup {
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
354 size = 15,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
355 open_mapping = [[<F12>]],
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
356 shade_filetypes = { 'none' },
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
357 shade_terminals = true,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
358 persist_size = true,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
359 direction = 'horizontal',
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
360 }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
361 end,
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
362 }
324
64a0c6cec54c Use packer for plugin management in lua
zegervdv <zegervdv@me.com>
parents: 323
diff changeset
363
409
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
364 -- Filetypes
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
365 use { 'Glench/Vim-Jinja2-Syntax' }
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
366 end)
f0300cd1584c Defer loading of packer config
zegervdv <zegervdv@me.com>
parents: 408
diff changeset
367 end, 0)
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
368
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
369 -- LSP config
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
370 local lsp = require 'lspconfig'
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
371 local null_ls = require 'null-ls'
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
372
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
373 local on_attach = function(client)
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
374 local nnoremap = vim.keymap.nnoremap
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
375 local inoremap = vim.keymap.inoremap
394
a80312c2755b Add goto-preview in favour of lspsaga for previewing
Zeger Van de Vannet <zegervdv@me.com>
parents: 390
diff changeset
376 -- nnoremap { '', require'lspsaga.diagnostic'.show_line_diagnostics, silent = true }
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
377 nnoremap { 'gd', vim.lsp.buf.declaration, silent = true }
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
378 nnoremap { '<c-]>', vim.lsp.buf.definition, silent = true }
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
379 nnoremap { 'K', require('lspsaga.hover').render_hover_doc, silent = true }
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
380 nnoremap { 'gD', vim.lsp.buf.implementation, silent = true }
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
381 nnoremap { '1gD', vim.lsp.buf.type_definition, silent = true }
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
382 nnoremap { 'gr', vim.lsp.buf.references, silent = true }
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
383 nnoremap { 'g0', vim.lsp.buf.document_symbol, silent = true }
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
384 nnoremap {
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
385 '<c-p>',
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
386 function()
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
387 vim.lsp.buf.formatting_sync({}, 5000)
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
388 end,
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
389 silent = true,
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
390 }
394
a80312c2755b Add goto-preview in favour of lspsaga for previewing
Zeger Van de Vannet <zegervdv@me.com>
parents: 390
diff changeset
391 -- nnoremap { 'gp', require'lspsaga.provider'.preview_definition, silent = true }
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
392 nnoremap { 'gp', require('goto-preview').goto_preview_definition, silent = true }
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
393 nnoremap { 'gP', require('goto-preview').close_all_win, silent = true }
372
6d1a9a926383 Restructure mappings
zegervdv <zegervdv@me.com>
parents: 371
diff changeset
394
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
395 inoremap { '<c-l>', vim.lsp.buf.signature_help, silent = true }
382
41a8b9f51e05 Clean up unused plugins
zegervdv <zegervdv@me.com>
parents: 381
diff changeset
396
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
397 vim.fn.sign_define(
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
398 'LspDiagnosticsSignError',
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
399 { texthl = 'LspDiagnosticsSignError', linehl = '', numhl = '', text = '▎' }
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
400 )
398
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
401 vim.fn.sign_define('LspDiagnosticsSignWarning', {
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
402 texthl = 'LspDiagnosticsSignWarning',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
403 linehl = '',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
404 numhl = '',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
405 text = '▎',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
406 })
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
407 vim.fn.sign_define('LspDiagnosticsSignInformation', {
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
408 texthl = 'LspDiagnosticsSignInformation',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
409 linehl = '',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
410 numhl = '',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
411 text = '▎',
aea0cbb82522 Format config.lua
zegervdv <zegervdv@me.com>
parents: 396
diff changeset
412 })
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
413 vim.fn.sign_define(
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
414 'LspDiagnosticsSignHint',
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
415 { texthl = 'LspDiagnosticsSignHint', linehl = '', numhl = '', text = '▎' }
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
416 )
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
417 end
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
418
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
419 vim.lsp.handlers['textDocument/formatting'] = function(err, _, result, _, bufnr)
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
420 if err ~= nil or result == nil then
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
421 return
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
422 end
380
3b7ebcd563e1 Format config with lua-format
zegervdv <zegervdv@me.com>
parents: 379
diff changeset
423 if not vim.api.nvim_buf_get_option(bufnr, 'modified') then
364
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
424 local view = vim.fn.winsaveview()
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
425 vim.lsp.util.apply_text_edits(result, bufnr)
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
426 -- Fix to reload Treesitter
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
427 -- vim.api.nvim_command("edit")
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
428 vim.fn.winrestview(view)
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
429 end
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
430 end
f300ef1bc475 Do not run LSP diagnostics while in insert mode
Zeger Van de Vannet <zegervdv@me.com>
parents: 363
diff changeset
431
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
432 vim.lsp.handlers['textDocument/publishDiagnostics'] = function(...)
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
433 vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { underline = true, update_in_insert = false })(...)
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
434 end
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
435
403
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
436 local capabilities = vim.lsp.protocol.make_client_capabilities()
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
437 capabilities.textDocument.completion.completionItem.snippetSupport = true
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
438 capabilities.textDocument.completion.completionItem.resolveSupport = {
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
439 properties = {
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
440 'documentation',
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
441 'detail',
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
442 'additionalTextEdits',
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
443 },
403
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
444 }
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
445
483c3746730f Pass capabilities for snippet completion
Zeger Van de Vannet <zegervdv@me.com>
parents: 402
diff changeset
446 lsp.pyright.setup { on_attach = on_attach, capabilities = capabilities }
319
b93f12d23fbd Rename init.lua to config.lua
Zeger Van de Vannet <zegervdv@me.com>
parents:
diff changeset
447
404
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
448 null_ls.setup {
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
449 on_attach = on_attach,
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
450 sources = {
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
451 null_ls.builtins.formatting.black,
405
34862cc22221 Add stylua formatting config
zegervdv <zegervdv@me.com>
parents: 404
diff changeset
452 null_ls.builtins.formatting.stylua,
404
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
453 },
04483ffbd282 Replace efm with null-ls
Zeger Van de Vannet <zegervdv@me.com>
parents: 403
diff changeset
454 }
332
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
455
408
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
456 local luadev = require('lua-dev').setup {
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
457 lspconfig = {
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
458 cmd = { 'lua-language-server' },
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
459 on_attach = on_attach,
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
460 capabilities = capabilities,
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
461 settings = {
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
462 Lua = {
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
463 diagnostics = {
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
464 globals = { 'use' },
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
465 },
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
466 },
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
467 },
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
468 },
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
469 }
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
470
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
471 lsp.sumneko_lua.setup(luadev)
4406fc85ba0a Add lua-language-server and lua-dev config for lua plugin development
zegervdv <zegervdv@me.com>
parents: 406
diff changeset
472
332
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
473 -- Try importing local config
5b166328c2fd Use localconfig lua file to load device specific configuration
Zeger Van de Vannet <zegervdv@me.com>
parents: 331
diff changeset
474 local ok, localconfig = pcall(require, 'localconfig')
406
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
475 if ok then
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
476 localconfig.setup { on_attach = on_attach, capabilities = capabilities }
270a0f0f4c7f Format with stylua
zegervdv <zegervdv@me.com>
parents: 405
diff changeset
477 end