diff options
author | Minijackson <minijackson@riseup.net> | 2021-06-07 12:21:23 +0200 |
---|---|---|
committer | Minijackson <minijackson@riseup.net> | 2021-06-07 12:21:23 +0200 |
commit | 2c6717b0a50c7edc1bbdc72b01738306db93c971 (patch) | |
tree | 5550d5aa68a0352bc0366d2e3ae63b893febd4f0 | |
parent | 35fb43e06bff96cdf1c4c8bbaf974927c912d5c4 (diff) | |
download | nixos-config-reborn-2c6717b0a50c7edc1bbdc72b01738306db93c971.tar.gz nixos-config-reborn-2c6717b0a50c7edc1bbdc72b01738306db93c971.zip |
vim: some more compe sources + vim-matchup
-rw-r--r-- | common/vim.nix | 6 | ||||
-rw-r--r-- | dotfiles/vim.lua | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/common/vim.nix b/common/vim.nix index ade66e1..ec21e75 100644 --- a/common/vim.nix +++ b/common/vim.nix | |||
@@ -36,7 +36,7 @@ let | |||
36 | inherit (config.vim) beforePlugins; | 36 | inherit (config.vim) beforePlugins; |
37 | 37 | ||
38 | customRC = '' | 38 | customRC = '' |
39 | autocmd VimEnter * lua require("myConfig") | 39 | lua require("myConfig") |
40 | 40 | ||
41 | ${cfg.extraConfig} | 41 | ${cfg.extraConfig} |
42 | ''; | 42 | ''; |
@@ -58,6 +58,8 @@ let | |||
58 | lsp-status-nvim | 58 | lsp-status-nvim |
59 | 59 | ||
60 | nvim-compe | 60 | nvim-compe |
61 | compe-latex-symbols | ||
62 | compe-zsh | ||
61 | 63 | ||
62 | vim-vsnip | 64 | vim-vsnip |
63 | vim-vsnip-integ | 65 | vim-vsnip-integ |
@@ -69,6 +71,8 @@ let | |||
69 | nvim-treesitter-textobjects | 71 | nvim-treesitter-textobjects |
70 | nvim-treesitter-context | 72 | nvim-treesitter-context |
71 | 73 | ||
74 | vim-matchup | ||
75 | |||
72 | # Motions | 76 | # Motions |
73 | camelcasemotion | 77 | camelcasemotion |
74 | surround | 78 | surround |
diff --git a/dotfiles/vim.lua b/dotfiles/vim.lua index c09b8e0..ca346f8 100644 --- a/dotfiles/vim.lua +++ b/dotfiles/vim.lua | |||
@@ -171,16 +171,18 @@ require("compe").setup { | |||
171 | source = { | 171 | source = { |
172 | buffer = true, | 172 | buffer = true, |
173 | calc = true, | 173 | calc = true, |
174 | latex_symbols = true, | ||
174 | nvim_lsp = true, | 175 | nvim_lsp = true, |
175 | nvim_lua = true, | 176 | nvim_lua = true, |
176 | nvim_treesitter = true, | 177 | nvim_treesitter = true, |
178 | omni = false, | ||
177 | path = true, | 179 | path = true, |
178 | spell = true, | 180 | spell = true, |
179 | vsnip = true, | 181 | vsnip = true, |
182 | zsh = true, | ||
180 | }, | 183 | }, |
181 | } | 184 | } |
182 | 185 | ||
183 | |||
184 | map("i", "<CR>", "compe#confirm('<CR>')", { noremap = true, silent = true, expr = true }) | 186 | map("i", "<CR>", "compe#confirm('<CR>')", { noremap = true, silent = true, expr = true }) |
185 | map("i", "<C-e>", "compe#close('<C-e>')", { noremap = true, silent = true, expr = true }) | 187 | map("i", "<C-e>", "compe#close('<C-e>')", { noremap = true, silent = true, expr = true }) |
186 | 188 | ||