From b14475aa3ea9f2e0cf979602c1ebf0963b351a62 Mon Sep 17 00:00:00 2001 From: David Holland Date: Wed, 20 Feb 2019 22:27:13 +0100 Subject: [PATCH] Not distributing the plugins themselves anymore! Also changed default autocomplete because deoplete can be a real pain in the butt! --- .gitignore | 3 +++ custom_template.vim | 1 + init.vim | 30 +++++++++++++++++++++++++++++- plugged/asyncrun.vim | 1 - plugged/deoplete.nvim | 1 - plugged/nerdcommenter | 1 - plugged/nerdtree | 1 - plugged/snes-syntax-vim | 1 - plugged/snow | 1 - plugged/snow_dark.vim | 38 -------------------------------------- plugged/templator_vim | 1 - plugged/vim-airline | 1 - plugged/vim-airline-themes | 1 - plugged/vim-asm-indent | 1 - plugged/vim-buftabline | 1 - plugged/vim-indentguides | 1 - plugged/vim-livedown | 1 - plugged/vim-pandoc | 1 - plugged/vim-pandoc-syntax | 1 - plugged/vim-polyglot | 1 - plugged/vim-table-mode | 1 - plugged/vimtex | 1 - 22 files changed, 33 insertions(+), 57 deletions(-) delete mode 160000 plugged/asyncrun.vim delete mode 160000 plugged/deoplete.nvim delete mode 160000 plugged/nerdcommenter delete mode 160000 plugged/nerdtree delete mode 160000 plugged/snes-syntax-vim delete mode 160000 plugged/snow delete mode 100644 plugged/snow_dark.vim delete mode 160000 plugged/templator_vim delete mode 160000 plugged/vim-airline delete mode 160000 plugged/vim-airline-themes delete mode 160000 plugged/vim-asm-indent delete mode 160000 plugged/vim-buftabline delete mode 160000 plugged/vim-indentguides delete mode 160000 plugged/vim-livedown delete mode 160000 plugged/vim-pandoc delete mode 160000 plugged/vim-pandoc-syntax delete mode 160000 plugged/vim-polyglot delete mode 160000 plugged/vim-table-mode delete mode 160000 plugged/vimtex diff --git a/.gitignore b/.gitignore index 5c387b8..6cfb8bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ .netrwhist platform.vim +custom.vim +plugged/* +plugged_bak diff --git a/custom_template.vim b/custom_template.vim index 6da5aff..2352705 100644 --- a/custom_template.vim +++ b/custom_template.vim @@ -1,2 +1,3 @@ "Here you can define your own custom settings like "let g:use_sound = 1 +"let g:use_autocomplete = 2 diff --git a/init.vim b/init.vim index b1f3874..22e303c 100644 --- a/init.vim +++ b/init.vim @@ -32,6 +32,20 @@ set smartindent set autoindent set diffopt=filler,vertical +let g:use_utf8=1 + +let g:use_autocomplete=0 + +if g:platform ==? "windows" || g:platform ==? "windows_portable" + let g:use_autocomplete == 3 + let g:ycm_clang = ' --clang-completer' " or '--clangd-completer' or '' + let g:ycm_java = ' --java-completer' " or '' +else + let g:use_autocomplete == 1 + let g:ycm_clang = '' + let g:ycm_java = '' +endif + let g:use_javacomplete=0 let g:use_comfortable_motion=0 @@ -47,6 +61,10 @@ else let g:use_font = 1 endif +if g:use_utf8 == 1 + set encoding=utf-8 +endif + let g:use_deoplete=1 let g:use_pandoc_markdown=1 let g:compile_on_save=0 @@ -127,10 +145,18 @@ Plug 'ARM9/snes-syntax-vim' Plug 'philj56/vim-asm-indent' " ==================================== +" ==================================== +" Git ================================ +" ==================================== +Plug 'tpope/vim-fugitive' +" ==================================== + " ==================================== " Autocompletion ===================== " ==================================== -if g:use_deoplete==1 +if g:use_autocomplete == 1 + Plug 'ajh17/VimCompletesMe' +elseif g:use_autocomplete == 2 if has('nvim') Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } else @@ -138,6 +164,8 @@ if g:use_deoplete==1 Plug 'roxma/nvim-yarp' Plug 'roxma/vim-hug-neovim-rpc' endif +elseif g:use_autocomplete == 3 + Plug 'Valloric/YouCompleteMe', { 'do': './install.py' . g:ycm_clang . g:ycm_java } endif if g:use_javacomplete==1 diff --git a/plugged/asyncrun.vim b/plugged/asyncrun.vim deleted file mode 160000 index 2df94f6..0000000 --- a/plugged/asyncrun.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2df94f619fe7153f6a9272263da5b88080f7dc38 diff --git a/plugged/deoplete.nvim b/plugged/deoplete.nvim deleted file mode 160000 index 5fe4bc9..0000000 --- a/plugged/deoplete.nvim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5fe4bc9f0befe64f2acc28f8fb78200f1884d674 diff --git a/plugged/nerdcommenter b/plugged/nerdcommenter deleted file mode 160000 index 5100f47..0000000 --- a/plugged/nerdcommenter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5100f47542cb9cab120f172816471e6c3e242278 diff --git a/plugged/nerdtree b/plugged/nerdtree deleted file mode 160000 index 8cc154d..0000000 --- a/plugged/nerdtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8cc154d4b0cf28f73815050b9782e6ac5a4d733d diff --git a/plugged/snes-syntax-vim b/plugged/snes-syntax-vim deleted file mode 160000 index 6e21ab3..0000000 --- a/plugged/snes-syntax-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6e21ab3c696c4c567bac4d724ea7d882181ba98f diff --git a/plugged/snow b/plugged/snow deleted file mode 160000 index ed02a88..0000000 --- a/plugged/snow +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ed02a88d1ed14279e42373e7909b13e3237e1dc3 diff --git a/plugged/snow_dark.vim b/plugged/snow_dark.vim deleted file mode 100644 index 32be344..0000000 --- a/plugged/snow_dark.vim +++ /dev/null @@ -1,38 +0,0 @@ -let g:airline#themes#snow_dark#palette = {} - -let s:gry0 = [ "#272e37", 236 ] -let s:gry1 = [ "#303945", 237 ] -let s:gry3 = [ "#b0bbcc", 250 ] -let s:red_ = [ "#d37b7d", 174 ] -let s:gren = [ "#6baa70", 71 ] -let s:blue = [ "#649ad8", 75 ] - -let s:nrm1 = [ s:gry0[0] , s:gry3[0] , s:gry0[1] , s:gry3[1] ] -let s:nrm2 = [ s:gry3[0] , s:gry1[0] , s:gry3[1] , s:gry1[1] ] -let s:insr = [ s:gry0[0] , s:gren[0] , s:gry0[1] , s:gren[1] ] -let s:visl = [ s:gry0[0] , s:blue[0] , s:gry0[1] , s:blue[1] ] -let s:rplc = [ s:gry0[0] , s:red_[0] , s:gry0[1] , s:red_[1] ] -let s:inac = [ s:gry3[0] , s:gry1[0] , s:gry3[1] , s:gry1[1] ] - -let g:airline#themes#snow_dark#palette.normal = - \ airline#themes#generate_color_map( s:nrm1 , s:nrm2 , s:nrm2 ) - -let g:airline#themes#snow_dark#palette.insert = - \ airline#themes#generate_color_map( s:insr , s:nrm2 , s:nrm2 ) - -let g:airline#themes#snow_dark#palette.visual = - \ airline#themes#generate_color_map( s:visl , s:nrm2 , s:nrm2 ) - -let g:airline#themes#snow_dark#palette.replace = - \ airline#themes#generate_color_map( s:rplc , s:nrm2 , s:nrm2 ) - -let g:airline#themes#snow_dark#palette.inactive = - \ airline#themes#generate_color_map( s:inac , s:inac , s:inac ) - -if !get(g:, "loaded_ctrlp", 0) - finish -endif - -let g:airline#themes#snow_dark#palette.ctrlp = - \ airline#extensions#ctrlp#generate_color_map( s:nrm2 , s:nrm1 , s:nrm2 ) - diff --git a/plugged/templator_vim b/plugged/templator_vim deleted file mode 160000 index f9a06f5..0000000 --- a/plugged/templator_vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f9a06f5fbe5272d033313eef322ffc8a36d40b8d diff --git a/plugged/vim-airline b/plugged/vim-airline deleted file mode 160000 index 448aa43..0000000 --- a/plugged/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 448aa43ec4bb49dfb3f75c3e52aad41eec9ee2ce diff --git a/plugged/vim-airline-themes b/plugged/vim-airline-themes deleted file mode 160000 index 3bfe1d0..0000000 --- a/plugged/vim-airline-themes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9 diff --git a/plugged/vim-asm-indent b/plugged/vim-asm-indent deleted file mode 160000 index 762e4f5..0000000 --- a/plugged/vim-asm-indent +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 762e4f571b777f5cb0a3f6a5bcbb58cdd4d45b89 diff --git a/plugged/vim-buftabline b/plugged/vim-buftabline deleted file mode 160000 index 14d208b..0000000 --- a/plugged/vim-buftabline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 14d208b1fa5f4308383e3ce429d57c84423029f9 diff --git a/plugged/vim-indentguides b/plugged/vim-indentguides deleted file mode 160000 index a0469bf..0000000 --- a/plugged/vim-indentguides +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a0469bfa49b00b85dd4aa5c82628cee957d54cca diff --git a/plugged/vim-livedown b/plugged/vim-livedown deleted file mode 160000 index a3f6072..0000000 --- a/plugged/vim-livedown +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a3f6072cef28c2bcb6f165d5cf5616c0699ae1e3 diff --git a/plugged/vim-pandoc b/plugged/vim-pandoc deleted file mode 160000 index 4acaf99..0000000 --- a/plugged/vim-pandoc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4acaf995515047dbdd7635f5c52dc12e5f8ca713 diff --git a/plugged/vim-pandoc-syntax b/plugged/vim-pandoc-syntax deleted file mode 160000 index 56e8e41..0000000 --- a/plugged/vim-pandoc-syntax +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 56e8e41ef863a0a7d33d85c3c0c895aa6e9e62d3 diff --git a/plugged/vim-polyglot b/plugged/vim-polyglot deleted file mode 160000 index 2fd4d9b..0000000 --- a/plugged/vim-polyglot +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2fd4d9b49e3417b58f51599e70525bfc9a85e388 diff --git a/plugged/vim-table-mode b/plugged/vim-table-mode deleted file mode 160000 index ad9229c..0000000 --- a/plugged/vim-table-mode +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ad9229c93702e52fdb07ce2b5ca45f7124aa9b98 diff --git a/plugged/vimtex b/plugged/vimtex deleted file mode 160000 index 837b946..0000000 --- a/plugged/vimtex +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 837b946c8fd4ebbb5f251ece5d9dae33fb3bda9d