Not distributing the plugins themselves anymore! Also changed default autocomplete because deoplete can be a real pain in the butt!

This commit is contained in:
David Holland 2019-02-20 22:27:13 +01:00
parent 6ed7c0f01d
commit b14475aa3e
22 changed files with 33 additions and 57 deletions

3
.gitignore vendored
View File

@ -1,2 +1,5 @@
.netrwhist
platform.vim
custom.vim
plugged/*
plugged_bak

View File

@ -1,2 +1,3 @@
"Here you can define your own custom settings like
"let g:use_sound = 1
"let g:use_autocomplete = 2

View File

@ -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

@ -1 +0,0 @@
Subproject commit 2df94f619fe7153f6a9272263da5b88080f7dc38

@ -1 +0,0 @@
Subproject commit 5fe4bc9f0befe64f2acc28f8fb78200f1884d674

@ -1 +0,0 @@
Subproject commit 5100f47542cb9cab120f172816471e6c3e242278

@ -1 +0,0 @@
Subproject commit 8cc154d4b0cf28f73815050b9782e6ac5a4d733d

@ -1 +0,0 @@
Subproject commit 6e21ab3c696c4c567bac4d724ea7d882181ba98f

@ -1 +0,0 @@
Subproject commit ed02a88d1ed14279e42373e7909b13e3237e1dc3

View File

@ -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 )

@ -1 +0,0 @@
Subproject commit f9a06f5fbe5272d033313eef322ffc8a36d40b8d

@ -1 +0,0 @@
Subproject commit 448aa43ec4bb49dfb3f75c3e52aad41eec9ee2ce

@ -1 +0,0 @@
Subproject commit 3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9

@ -1 +0,0 @@
Subproject commit 762e4f571b777f5cb0a3f6a5bcbb58cdd4d45b89

@ -1 +0,0 @@
Subproject commit 14d208b1fa5f4308383e3ce429d57c84423029f9

@ -1 +0,0 @@
Subproject commit a0469bfa49b00b85dd4aa5c82628cee957d54cca

@ -1 +0,0 @@
Subproject commit a3f6072cef28c2bcb6f165d5cf5616c0699ae1e3

@ -1 +0,0 @@
Subproject commit 4acaf995515047dbdd7635f5c52dc12e5f8ca713

@ -1 +0,0 @@
Subproject commit 56e8e41ef863a0a7d33d85c3c0c895aa6e9e62d3

@ -1 +0,0 @@
Subproject commit 2fd4d9b49e3417b58f51599e70525bfc9a85e388

@ -1 +0,0 @@
Subproject commit ad9229c93702e52fdb07ce2b5ca45f7124aa9b98

@ -1 +0,0 @@
Subproject commit 837b946c8fd4ebbb5f251ece5d9dae33fb3bda9d