aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--programs/init.vim13
-rw-r--r--programs/neovim.nix8
2 files changed, 9 insertions, 12 deletions
diff --git a/programs/init.vim b/programs/init.vim
index 0393912..4a822da 100644
--- a/programs/init.vim
+++ b/programs/init.vim
@@ -47,12 +47,6 @@ augroup fzfstatus
47 endif 47 endif
48augroup END 48augroup END
49 49
50augroup completions
51 " Use completion-nvim in every buffer
52 autocmd!
53 autocmd BufEnter * lua require'completion'.on_attach()
54augroup END
55
56" general settings 50" general settings
57set nobackup 51set nobackup
58set nowritebackup 52set nowritebackup
@@ -96,7 +90,7 @@ set signcolumn=yes
96set inccommand=split 90set inccommand=split
97set showmatch 91set showmatch
98set diffopt+=vertical 92set diffopt+=vertical
99set completeopt=menuone,noinsert,noselect 93set completeopt=menu,menuone,noselect
100set exrc 94set exrc
101 95
102let g:netrw_browsex_viewer= "xdg-open" 96let g:netrw_browsex_viewer= "xdg-open"
@@ -170,9 +164,6 @@ let g:tex_flavor = 'latex'
170 164
171let g:elm_setup_keybindings = 0 165let g:elm_setup_keybindings = 0
172 166
173let g:completion_matching_strategy_list = ['exact', 'substring', 'fuzzy', 'all']
174let g:completion_trigger_on_delete = 1
175
176sign define LspDiagnosticsSignError text=× texthl=LspDiagnosticsSignError linehl= numhl= 167sign define LspDiagnosticsSignError text=× texthl=LspDiagnosticsSignError linehl= numhl=
177sign define LspDiagnosticsSignWarning text=\! texthl=LspDiagnosticsSignWarning linehl= numhl= 168sign define LspDiagnosticsSignWarning text=\! texthl=LspDiagnosticsSignWarning linehl= numhl=
178sign define LspDiagnosticsSignInformation text=i texthl=LspDiagnosticsSignInformation linehl= numhl= 169sign define LspDiagnosticsSignInformation text=i texthl=LspDiagnosticsSignInformation linehl= numhl=
@@ -183,5 +174,5 @@ let g:user_emmet_leader_key='<C-X>'
183lua << EOF 174lua << EOF
184require 'lsp' 175require 'lsp'
185require 'treesitter' 176require 'treesitter'
177require 'completions'
186EOF 178EOF
187
diff --git a/programs/neovim.nix b/programs/neovim.nix
index e4878b3..fc3cc85 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -22,7 +22,13 @@
22 # neovim only 22 # neovim only
23 nvim-lspconfig 23 nvim-lspconfig
24 (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars)) 24 (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars))
25 completion-nvim 25 nvim-cmp
26
27 # completion sources
28 cmp-nvim-lsp
29 cmp-buffer
30 cmp-path
31 cmp-cmdline
26 32
27 # tpope 33 # tpope
28 vim-surround 34 vim-surround