From: Jannik ZANDER Date: Sat, 7 Jul 2018 06:50:36 +0000 (+0200) Subject: Move vim packages to opt X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=74f74446fd7a6758fb2475e5988241aeca5e1fe5;p=dotfiles.git Move vim packages to opt --- diff --git a/.gitmodules b/.gitmodules index 7958422..4522e99 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,33 +1,33 @@ [submodule ".vim/pack/plugins/start/vim-airline"] - path = .vim/pack/plugins/start/vim-airline + path = .vim/pack/github/opt/vim-airline url = https://github.com/vim-airline/vim-airline.git [submodule ".vim/pack/plugins/start/Tortoise-Typing"] - path = .vim/pack/plugins/start/Tortoise-Typing + path = .vim/pack/github/opt/Tortoise-Typing url = https://github.com/thanthese/Tortoise-Typing.git [submodule ".vim/pack/plugins/start/ale"] - path = .vim/pack/plugins/start/ale + path = .vim/pack/github/opt/ale url = https://github.com/w0rp/ale.git [submodule ".vim/pack/plugins/start/vim-fugitive"] - path = .vim/pack/plugins/start/vim-fugitive + path = .vim/pack/github/opt/vim-fugitive url = https://github.com/tpope/vim-fugitive.git [submodule ".vim/pack/plugins/start/vim-unimpaired"] - path = .vim/pack/plugins/start/vim-unimpaired + path = .vim/pack/github/opt/vim-unimpaired url = https://github.com/tpope/vim-unimpaired.git [submodule ".vim/pack/plugins/opt/ultisnips"] - path = .vim/pack/plugins/opt/ultisnips + path = .vim/pack/github/opt/ultisnips url = https://github.com/SirVer/ultisnips.git [submodule ".vim/pack/plugins/start/ropevim"] - path = .vim/pack/plugins/start/ropevim + path = .vim/pack/github/opt/ropevim url = https://github.com/python-rope/ropevim.git [submodule ".vim/pack/plugins/start/editorconfig-vim"] - path = .vim/pack/plugins/start/editorconfig-vim + path = .vim/pack/github/opt/editorconfig-vim url = https://github.com/editorconfig/editorconfig-vim.git [submodule ".vim/pack/plugins/start/tagbar"] - path = .vim/pack/plugins/start/tagbar + path = .vim/pack/github/opt/tagbar url = https://github.com/majutsushi/tagbar.git [submodule ".vim/pack/plugins/start/incsearch.vim"] - path = .vim/pack/plugins/start/incsearch.vim + path = .vim/pack/github/opt/incsearch.vim url = https://github.com/haya14busa/incsearch.vim.git [submodule ".vim/pack/plugins/start/ctrlp.vim"] - path = .vim/pack/plugins/start/ctrlp.vim + path = .vim/pack/github/opt/ctrlp.vim url = https://github.com/ctrlpvim/ctrlp.vim.git diff --git a/.vim/pack/github/opt/Tortoise-Typing b/.vim/pack/github/opt/Tortoise-Typing new file mode 160000 index 0000000..3ec01ed --- /dev/null +++ b/.vim/pack/github/opt/Tortoise-Typing @@ -0,0 +1 @@ +Subproject commit 3ec01ed3ff192620194e538670ed331d658e7f13 diff --git a/.vim/pack/github/opt/ale b/.vim/pack/github/opt/ale new file mode 160000 index 0000000..22533f2 --- /dev/null +++ b/.vim/pack/github/opt/ale @@ -0,0 +1 @@ +Subproject commit 22533f2c1f09bcf19dfba9e24a6a948c3d2716c0 diff --git a/.vim/pack/github/opt/ctrlp.vim b/.vim/pack/github/opt/ctrlp.vim new file mode 160000 index 0000000..e66b5b5 --- /dev/null +++ b/.vim/pack/github/opt/ctrlp.vim @@ -0,0 +1 @@ +Subproject commit e66b5b50e5c539354813e2ecac6fb75a2121e29e diff --git a/.vim/pack/github/opt/editorconfig-vim b/.vim/pack/github/opt/editorconfig-vim new file mode 160000 index 0000000..0abb063 --- /dev/null +++ b/.vim/pack/github/opt/editorconfig-vim @@ -0,0 +1 @@ +Subproject commit 0abb0634a8bf3c760a283e9e7475594b83869a46 diff --git a/.vim/pack/github/opt/incsearch.vim b/.vim/pack/github/opt/incsearch.vim new file mode 160000 index 0000000..25e2547 --- /dev/null +++ b/.vim/pack/github/opt/incsearch.vim @@ -0,0 +1 @@ +Subproject commit 25e2547fb0566460f5999024f7a0de7b3775201f diff --git a/.vim/pack/github/opt/ropevim b/.vim/pack/github/opt/ropevim new file mode 160000 index 0000000..ab87505 --- /dev/null +++ b/.vim/pack/github/opt/ropevim @@ -0,0 +1 @@ +Subproject commit ab87505b4aff3695e1385a3e463a7f7d5c473ad9 diff --git a/.vim/pack/github/opt/tagbar b/.vim/pack/github/opt/tagbar new file mode 160000 index 0000000..387bbad --- /dev/null +++ b/.vim/pack/github/opt/tagbar @@ -0,0 +1 @@ +Subproject commit 387bbadda98e1376ff3871aa461b1f0abd4ece70 diff --git a/.vim/pack/github/opt/ultisnips b/.vim/pack/github/opt/ultisnips new file mode 160000 index 0000000..6fdc364 --- /dev/null +++ b/.vim/pack/github/opt/ultisnips @@ -0,0 +1 @@ +Subproject commit 6fdc3647f72e0a1f321ea6bd092ecd01f7c187ba diff --git a/.vim/pack/github/opt/vim-airline b/.vim/pack/github/opt/vim-airline new file mode 160000 index 0000000..45c9621 --- /dev/null +++ b/.vim/pack/github/opt/vim-airline @@ -0,0 +1 @@ +Subproject commit 45c9621157b5bc851804bfed57b8a504d55757b0 diff --git a/.vim/pack/github/opt/vim-fugitive b/.vim/pack/github/opt/vim-fugitive new file mode 160000 index 0000000..8fa5cad --- /dev/null +++ b/.vim/pack/github/opt/vim-fugitive @@ -0,0 +1 @@ +Subproject commit 8fa5cad8d7502be2f3438d02f353ab62264d358e diff --git a/.vim/pack/github/opt/vim-unimpaired b/.vim/pack/github/opt/vim-unimpaired new file mode 160000 index 0000000..f185e75 --- /dev/null +++ b/.vim/pack/github/opt/vim-unimpaired @@ -0,0 +1 @@ +Subproject commit f185e75b87a092162099ca2781626253a5a41a67 diff --git a/.vim/pack/plugins/opt/ultisnips b/.vim/pack/plugins/opt/ultisnips deleted file mode 160000 index 6fdc364..0000000 --- a/.vim/pack/plugins/opt/ultisnips +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6fdc3647f72e0a1f321ea6bd092ecd01f7c187ba diff --git a/.vim/pack/plugins/start/Tortoise-Typing b/.vim/pack/plugins/start/Tortoise-Typing deleted file mode 160000 index 3ec01ed..0000000 --- a/.vim/pack/plugins/start/Tortoise-Typing +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3ec01ed3ff192620194e538670ed331d658e7f13 diff --git a/.vim/pack/plugins/start/ale b/.vim/pack/plugins/start/ale deleted file mode 160000 index 22533f2..0000000 --- a/.vim/pack/plugins/start/ale +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 22533f2c1f09bcf19dfba9e24a6a948c3d2716c0 diff --git a/.vim/pack/plugins/start/ctrlp.vim b/.vim/pack/plugins/start/ctrlp.vim deleted file mode 160000 index e66b5b5..0000000 --- a/.vim/pack/plugins/start/ctrlp.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e66b5b50e5c539354813e2ecac6fb75a2121e29e diff --git a/.vim/pack/plugins/start/editorconfig-vim b/.vim/pack/plugins/start/editorconfig-vim deleted file mode 160000 index 0abb063..0000000 --- a/.vim/pack/plugins/start/editorconfig-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0abb0634a8bf3c760a283e9e7475594b83869a46 diff --git a/.vim/pack/plugins/start/incsearch.vim b/.vim/pack/plugins/start/incsearch.vim deleted file mode 160000 index 25e2547..0000000 --- a/.vim/pack/plugins/start/incsearch.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25e2547fb0566460f5999024f7a0de7b3775201f diff --git a/.vim/pack/plugins/start/ropevim b/.vim/pack/plugins/start/ropevim deleted file mode 160000 index ab87505..0000000 --- a/.vim/pack/plugins/start/ropevim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ab87505b4aff3695e1385a3e463a7f7d5c473ad9 diff --git a/.vim/pack/plugins/start/tagbar b/.vim/pack/plugins/start/tagbar deleted file mode 160000 index 387bbad..0000000 --- a/.vim/pack/plugins/start/tagbar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 387bbadda98e1376ff3871aa461b1f0abd4ece70 diff --git a/.vim/pack/plugins/start/vim-airline b/.vim/pack/plugins/start/vim-airline deleted file mode 160000 index 45c9621..0000000 --- a/.vim/pack/plugins/start/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 45c9621157b5bc851804bfed57b8a504d55757b0 diff --git a/.vim/pack/plugins/start/vim-fugitive b/.vim/pack/plugins/start/vim-fugitive deleted file mode 160000 index 8fa5cad..0000000 --- a/.vim/pack/plugins/start/vim-fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8fa5cad8d7502be2f3438d02f353ab62264d358e diff --git a/.vim/pack/plugins/start/vim-unimpaired b/.vim/pack/plugins/start/vim-unimpaired deleted file mode 160000 index f185e75..0000000 --- a/.vim/pack/plugins/start/vim-unimpaired +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f185e75b87a092162099ca2781626253a5a41a67 diff --git a/.vim/vimrc b/.vim/vimrc index 5534c11..9abf62d 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -7,13 +7,13 @@ set backupdir=~/.local/share/vim/backup set undodir=~/.local/share/vim/undo set viminfo+=n~/.local/share/vim/viminfo -set undofile +set path=.,,**,C:\programs\IAR\\\ System\EWB_V850_V360\common\bin set fileformats=unix,dos,mac set printoptions=paper:letter set shell=/bin/bash - +set undofile set autoread -set autowrite " automatically save before commands like :next and :make +set autowrite "set autoindent set backspace=2 @@ -35,7 +35,6 @@ set guioptions-=r "scroolbar set complete-=i " searching includes can be slow set history=200 set incsearch " incremental search -set laststatus=2 " always show status line set lazyredraw set linebreak @@ -46,6 +45,7 @@ set number set scrolloff=1 set shiftround set shortmess=aoOtI +set laststatus=2 " always show status line set cmdheight=2 set showcmd " show (partial) command in status line. @@ -53,7 +53,7 @@ set showmatch " show matching brackets. set sidescrolloff=5 set smartcase " case insensitive searches become sensitive with capitals "setglobal tags=./tags; -" + set timeoutlen=500 " leader key timeout set ttimeoutlen=50 " make esc work faster @@ -67,8 +67,7 @@ set wildignore+=tags,.*.un~,*.pyc set winaltkeys=no " visual -""""""""""""""""""""""""""""""""""""""""" - +" --------------------- highlight Normal guibg=black guifg=white set background=dark set t_Co=256 @@ -93,88 +92,27 @@ if (&t_Co > 2 || has("gui_running")) && has("syntax") endif endif - -" make -""""""""""""""""""""""""""""""""""""""""" - -set path=.,,**,C:\programs\IAR\\\ System\EWB_V850_V360\common\bin - -"set makeprg=cmake\ --build\ . -set makeprg=msbuild -" Visual studio 2013 -set errorformat=\ %#%f(%l):\ %m -" Visual studio 2008 -"set errorformat=%.%#>\ %#%f(%l)\ :\ %m -" -" IAR compiler -"if executable('vim-iarbuild.cmd') -" set makeprg=vim-iarbuild.cmd -" set errorformat=%f(%l)\ :\ %m -"endif - -" grep -""""""""""""""""""""""""""""""""""""""""" - -if executable('ag') - set grepprg=ag\ --vimgrep\ --skip-vcs-ignores\ --path-to-ignore\ ~/.ignore\ --cpp\ --cc - set grepformat^=%f:%l:%c:%m " file:line:coloumn:message -endif - - -" settings -""""""""""""""""""""""""""""""""""""""""" - " block cursor in normal mode let &t_ti.="\e[1 q" let &t_SI.="\e[5 q" let &t_EI.="\e[1 q" let &t_te.="\e[0 q" +" plugins +" --------------------- +packadd tagbar +packadd vim-fugitive +packadd vim-gtags +packadd vim-unimpaired + " netrw +" --------------------- let g:netrw_liststyle=3 let g:netrw_banner = 0 let g:netrw_sort_sequence = '[\/]$,*' - -" airline -let g:airline#extensions#tabline#enabled = 1 - -" editorconfig -let g:editorconfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] -let g:editorconfig_verbose = 1 - -if has("win32") - let g:EditorConfig_exec_path = "C:\programs\editorconfig\bin\editorconfig.exe" -else - let g:editorconfig_core_mode = "python_builtin" -endif - - -" mappings -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let mapleader = "," - -" grep under cursor -nnoremap * :silent grep \| copen " redraws the screen - -" buffers -nnoremap b :buffer - -" tags -nnoremap t :tags - -" ctrl-p -let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard'] -let g:ctrlp_map = '' -let g:ctrlp_cmd = 'CtrlP' - -" ctrl-hjkl to windows navigation and resizing -nnoremap -nnoremap -nnoremap -nnoremap - " ranger +" --------------------- function! RangeChooser() let temp = tempname() " The option "--choosefiles" was added in ranger 1.5.1. Use the next line @@ -207,6 +145,71 @@ endfunction command! -bar RangerChooser call RangeChooser() nnoremap r :RangerChooser +" airline +" --------------------- +packadd vim-airline +let g:airline#extensions#tabline#enabled = 1 + +" editorconfig +" --------------------- +packadd editorconfig-vim +let g:editorconfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] +let g:editorconfig_verbose = 1 + +if has("win32") + let g:EditorConfig_exec_path = "C:\programs\editorconfig\bin\editorconfig.exe" +else + let g:editorconfig_core_mode = "python_builtin" +endif + +" make +" --------------------- +"set makeprg=cmake\ --build\ . +set makeprg=msbuild +" Visual studio 2013 +set errorformat=\ %#%f(%l):\ %m +" Visual studio 2008 +"set errorformat=%.%#>\ %#%f(%l)\ :\ %m +" +" IAR compiler +"if executable('vim-iarbuild.cmd') +" set makeprg=vim-iarbuild.cmd +" set errorformat=%f(%l)\ :\ %m +"endif + +" grep +" --------------------- +if executable('ag') + set grepprg=ag\ --vimgrep\ --skip-vcs-ignores\ --path-to-ignore\ ~/.ignore\ --cpp\ --cc + set grepformat^=%f:%l:%c:%m " file:line:coloumn:message +endif +" grep under cursor +nnoremap * :silent grep \| copen " redraws the screen + +" ctrl-p +" --------------------- +packadd ctrlp.vim +let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard'] +let g:ctrlp_map = '' +let g:ctrlp_cmd = 'CtrlP' + +" mappings +" --------------------- +let mapleader = "," + +" buffers +nnoremap b :buffer + +" tags +nnoremap t :tags + +" ctrl-hjkl to windows navigation and resizing +nnoremap +nnoremap +nnoremap +nnoremap + + " Maps Ctrl-[h,j,k,l,+,-] to windows split navigations and resizing nnoremap nnoremap @@ -218,7 +221,6 @@ nnoremap :exe "resize " . (winheight(0) * 2/3) nnoremap :exe "resize " . (winheight(0) * 3/2) endif - " folding noremap za @@ -226,7 +228,7 @@ noremap za ca w!! w !sudo tee "%" " autocommands -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" --------------------- if has("autocmd") filetype plugin indent on @@ -236,7 +238,7 @@ if has("autocmd") endif " local -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" --------------------- if filereadable(expand('~/.vim/vimrc.local')) source ~/.vim/vimrc.local endif