dolysis
/
psoxizsh
3
1
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Updated .gitignore

This commit is contained in:
pSox 2018-08-09 19:22:57 +00:00
parent 91f7a69041
commit bcd347a4e0
4 changed files with 24 additions and 2510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
vim/autoload/*.old vim/autoload/**old
vim/plugged/ vim/plugged/
vim/.netrwhist vim/.netrwhist

14
vim/autoload/plug.vim
View File

@ -96,7 +96,7 @@ let s:plug_src = 'https://github.com/junegunn/vim-plug.git'
let s:plug_tab = get(s:, 'plug_tab', -1) let s:plug_tab = get(s:, 'plug_tab', -1)
let s:plug_buf = get(s:, 'plug_buf', -1) let s:plug_buf = get(s:, 'plug_buf', -1)
let s:mac_gui = has('gui_macvim') && has('gui_running') let s:mac_gui = has('gui_macvim') && has('gui_running')
let s:is_win = has('win32') || has('win64') let s:is_win = has('win32')
let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win) let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
let s:vim8 = has('patch-8.0.0039') && exists('*job_start') let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
let s:me = resolve(expand('<sfile>:p')) let s:me = resolve(expand('<sfile>:p'))
@ -763,6 +763,9 @@ function! s:prepare(...)
execute 'silent! unmap <buffer>' k execute 'silent! unmap <buffer>' k
endfor endfor
setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
if exists('+colorcolumn')
setlocal colorcolumn=
endif
setf vim-plug setf vim-plug
if exists('g:syntax_on') if exists('g:syntax_on')
call s:syntax() call s:syntax()
@ -2426,8 +2429,13 @@ function! s:diff()
\ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : '')) \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
if cnts[0] || cnts[1] if cnts[0] || cnts[1]
nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr> nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr>
nnoremap <silent> <buffer> o :silent! call <SID>preview_commit()<cr> if empty(maparg("\<cr>", 'n'))
nmap <buffer> <cr> <plug>(plug-preview)
endif
if empty(maparg('o', 'n'))
nmap <buffer> o <plug>(plug-preview)
endif
endif endif
if cnts[0] if cnts[0]
nnoremap <silent> <buffer> X :call <SID>revert()<cr> nnoremap <silent> <buffer> X :call <SID>revert()<cr>

2504
vim/autoload/plug.vim.old
View File

File diff suppressed because it is too large Load Diff

14
vimrc
View File

@ -18,7 +18,16 @@ call plug#begin("$VIMHOME/plugged")
Plug 'pearofducks/ansible-vim' Plug 'pearofducks/ansible-vim'
if v:version > 704 if v:version > 704
Plug 'Valloric/YouCompleteMe' Plug 'Valloric/YouCompleteMe'
Plug 'prabirshrestha/async.vim'
endif endif
if has('nvim')
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
else
Plug 'Shougo/deoplete.nvim'
Plug 'roxma/nvim-yarp'
Plug 'roxma/vim-hug-neovim-rpc'
endif
call plug#end() call plug#end()
set number set number
@ -53,7 +62,9 @@ let g:syntastic_enable_zsh_checker = 1
let g:syntastic_enable_bash_checker = 1 let g:syntastic_enable_bash_checker = 1
" rust lang " rust lang
let g:ycm_rust_src_path = '~/.multirust/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustc' autocmd FileType rust let g:autofmt_autosave = 1
autocmd FileType rust let g:deoplete#enable_at_startup = 1
let g:ycm_rust_src_path = expand('~/.multirust/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustc')
" Other " Other
set shiftwidth=2 set shiftwidth=2
@ -71,5 +82,4 @@ cmap w!! w !sudo tee % > /dev/null
set modeline set modeline
set modelines=7 set modelines=7
" vim: ts=8 sw=2 si " vim: ts=8 sw=2 si