summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaron Kent-Dobias <jaron@kent-dobias.com>2019-09-23 11:08:10 -0400
committerJaron Kent-Dobias <jaron@kent-dobias.com>2019-09-23 11:08:10 -0400
commit35ff775795ca2a843a47c7a65cc32c015feb582e (patch)
treed2ef1364a8bf02dbcc23829fc98a4b4a1c223a5b
parentab18d4647c83e10775e7e4a87d6ea0570126dd65 (diff)
parentb1772bb5662d4933abfe501fc2c2074907cd7dd6 (diff)
downloadvim-35ff775795ca2a843a47c7a65cc32c015feb582e.tar.gz
vim-35ff775795ca2a843a47c7a65cc32c015feb582e.tar.bz2
vim-35ff775795ca2a843a47c7a65cc32c015feb582e.zip
merged spelling
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules12
m---------plugged/coc.nvim0
m---------plugged/vim-fugitive0
m---------plugged/vim-mma0
m---------plugged/vimtex0
m---------repos/lsp-wl0
m---------repos/wolfram-vim0
-rw-r--r--spell/en.utf-8.add2
-rw-r--r--spell/en.utf-8.add.splbin2038 -> 0 bytes
-rw-r--r--vimrc19
11 files changed, 34 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5b40bd7..ff11a15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
info
swaps/*
+spell/*.spl
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 cb90d583b7d584d87d306b2b99abdbb09758819
+Subproject 549ea17ce8bc0fe3697f4adac2a8647219aa6f4
diff --git a/repos/lsp-wl b/repos/lsp-wl
new file mode 160000
+Subproject 7adcf02f324c0c16f7afe81e6c3234416c2574b
diff --git a/repos/wolfram-vim b/repos/wolfram-vim
-Subproject 2f748fee56bbadf08350bd2bfc591c270583436
+Subproject 6827deb774338c35780ad2a71e8d26cb372bc6f
diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add
index 2bd9496..340ed0a 100644
--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -161,3 +161,5 @@ Swendsen
Fortuin
#henomonology
thermalization
+multicritical
+cuprates
diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl
deleted file mode 100644
index b8afade..0000000
--- a/spell/en.utf-8.add.spl
+++ /dev/null
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()