summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaron Kent-Dobias <jaron@kent-dobias.com>2019-09-23 09:26:42 -0400
committerJaron Kent-Dobias <jaron@kent-dobias.com>2019-09-23 09:26:42 -0400
commitb1772bb5662d4933abfe501fc2c2074907cd7dd6 (patch)
tree29daae06ec37cbb8b5a2c80bceeac21b69bc2b6e
parent90f8ce1ec7ab654fc5ee77d2abb28c1fe409f422 (diff)
downloadvim-b1772bb5662d4933abfe501fc2c2074907cd7dd6.tar.gz
vim-b1772bb5662d4933abfe501fc2c2074907cd7dd6.tar.bz2
vim-b1772bb5662d4933abfe501fc2c2074907cd7dd6.zip
added coc and other modules, moved to nvim
-rw-r--r--.gitmodules12
m---------plugged/coc.nvim0
m---------plugged/vim-fugitive0
m---------plugged/vim-mma0
m---------plugged/vimtex0
m---------repos/lsp-wl0
-rw-r--r--spell/en.utf-8.add2
-rw-r--r--spell/en.utf-8.add.splbin2003 -> 2047 bytes
-rw-r--r--vimrc19
9 files changed, 33 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index e3cec71..bc5fc76 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,15 @@
[submodule "plugged/vim-hindent"]
path = plugged/vim-hindent
url = https://github.com/alx741/vim-hindent
+[submodule "plugged/coc.nvim"]
+ path = plugged/coc.nvim
+ url = https://github.com/neoclide/coc.nvim
+[submodule "plugged/vim-fugitive"]
+ path = plugged/vim-fugitive
+ url = https://github.com/tpope/vim-fugitive
+[submodule "plugged/vim-mma"]
+ path = plugged/vim-mma
+ url = https://github.com/voldikss/vim-mma
+[submodule "repos/lsp-wl"]
+ path = repos/lsp-wl
+ url = https://github.com/kenkangxgwe/lsp-wl.git
diff --git a/plugged/coc.nvim b/plugged/coc.nvim
new file mode 160000
+Subproject 741de710b692530371bc9e042d99eabe9e90b0e
diff --git a/plugged/vim-fugitive b/plugged/vim-fugitive
new file mode 160000
+Subproject 1d8c0a38b2fc4ce9ca4204676573b6335725ff7
diff --git a/plugged/vim-mma b/plugged/vim-mma
new file mode 160000
+Subproject 2784175361fbe167d62686787fb06300cc2f9ff
diff --git a/plugged/vimtex b/plugged/vimtex
-Subproject 365e3d27d922036d5770a2591a3670cc5a3db77
+Subproject 549ea17ce8bc0fe3697f4adac2a8647219aa6f4
diff --git a/repos/lsp-wl b/repos/lsp-wl
new file mode 160000
+Subproject 7adcf02f324c0c16f7afe81e6c3234416c2574b
diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add
index c1af71f..bb99c8f 100644
--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -158,3 +158,5 @@ Ising
Ginzburg
Lifshitz
Swendsen
+multicritical
+cuprates
diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl
index 1be0499..d07a077 100644
--- a/spell/en.utf-8.add.spl
+++ b/spell/en.utf-8.add.spl
Binary files differ
diff --git a/vimrc b/vimrc
index 3e708bd..7ea450a 100644
--- a/vimrc
+++ b/vimrc
@@ -43,12 +43,31 @@ autocmd BufNewFile,BufRead *.wl set syntax=wl
autocmd BufNewFile,BufRead *.wls set syntax=wl
autocmd BufNewFile,BufRead *.m set syntax=wl
+" use <tab> for trigger completion and navigate to the next complete item
+function! s:check_back_space() abort
+ let col = col('.') - 1
+ return !col || getline('.')[col - 1] =~ '\s'
+endfunction
+
+inoremap <silent><expr> <Tab>
+ \ pumvisible() ? "\<C-n>" :
+ \ <SID>check_back_space() ? "\<Tab>" :
+ \ coc#refresh()
+
+inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
+inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+
+inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
+
call plug#begin()
Plug 'lervag/vimtex'
Plug 'rhysd/vim-clang-format'
Plug 'neovimhaskell/haskell-vim'
Plug 'alx741/vim-hindent'
+Plug 'tpope/vim-fugitive'
+Plug 'neoclide/coc.nvim'
+Plug 'voldikss/vim-mma'
call plug#end()