From 74f74446fd7a6758fb2475e5988241aeca5e1fe5 Mon Sep 17 00:00:00 2001 From: Jannik ZANDER Date: Sat, 7 Jul 2018 08:50:36 +0200 Subject: [PATCH] Move vim packages to opt --- .gitmodules | 22 +-- .../start => github/opt}/Tortoise-Typing | 0 .vim/pack/{plugins/start => github/opt}/ale | 0 .../{plugins/start => github/opt}/ctrlp.vim | 0 .../start => github/opt}/editorconfig-vim | 0 .../start => github/opt}/incsearch.vim | 0 .../{plugins/start => github/opt}/ropevim | 0 .../pack/{plugins/start => github/opt}/tagbar | 0 .vim/pack/{plugins => github}/opt/ultisnips | 0 .../{plugins/start => github/opt}/vim-airline | 0 .../start => github/opt}/vim-fugitive | 0 .../start => github/opt}/vim-unimpaired | 0 .vim/vimrc | 162 +++++++++--------- 13 files changed, 93 insertions(+), 91 deletions(-) rename .vim/pack/{plugins/start => github/opt}/Tortoise-Typing (100%) rename .vim/pack/{plugins/start => github/opt}/ale (100%) rename .vim/pack/{plugins/start => github/opt}/ctrlp.vim (100%) rename .vim/pack/{plugins/start => github/opt}/editorconfig-vim (100%) rename .vim/pack/{plugins/start => github/opt}/incsearch.vim (100%) rename .vim/pack/{plugins/start => github/opt}/ropevim (100%) rename .vim/pack/{plugins/start => github/opt}/tagbar (100%) rename .vim/pack/{plugins => github}/opt/ultisnips (100%) rename .vim/pack/{plugins/start => github/opt}/vim-airline (100%) rename .vim/pack/{plugins/start => github/opt}/vim-fugitive (100%) rename .vim/pack/{plugins/start => github/opt}/vim-unimpaired (100%) 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/plugins/start/Tortoise-Typing b/.vim/pack/github/opt/Tortoise-Typing similarity index 100% rename from .vim/pack/plugins/start/Tortoise-Typing rename to .vim/pack/github/opt/Tortoise-Typing diff --git a/.vim/pack/plugins/start/ale b/.vim/pack/github/opt/ale similarity index 100% rename from .vim/pack/plugins/start/ale rename to .vim/pack/github/opt/ale diff --git a/.vim/pack/plugins/start/ctrlp.vim b/.vim/pack/github/opt/ctrlp.vim similarity index 100% rename from .vim/pack/plugins/start/ctrlp.vim rename to .vim/pack/github/opt/ctrlp.vim diff --git a/.vim/pack/plugins/start/editorconfig-vim b/.vim/pack/github/opt/editorconfig-vim similarity index 100% rename from .vim/pack/plugins/start/editorconfig-vim rename to .vim/pack/github/opt/editorconfig-vim diff --git a/.vim/pack/plugins/start/incsearch.vim b/.vim/pack/github/opt/incsearch.vim similarity index 100% rename from .vim/pack/plugins/start/incsearch.vim rename to .vim/pack/github/opt/incsearch.vim diff --git a/.vim/pack/plugins/start/ropevim b/.vim/pack/github/opt/ropevim similarity index 100% rename from .vim/pack/plugins/start/ropevim rename to .vim/pack/github/opt/ropevim diff --git a/.vim/pack/plugins/start/tagbar b/.vim/pack/github/opt/tagbar similarity index 100% rename from .vim/pack/plugins/start/tagbar rename to .vim/pack/github/opt/tagbar diff --git a/.vim/pack/plugins/opt/ultisnips b/.vim/pack/github/opt/ultisnips similarity index 100% rename from .vim/pack/plugins/opt/ultisnips rename to .vim/pack/github/opt/ultisnips diff --git a/.vim/pack/plugins/start/vim-airline b/.vim/pack/github/opt/vim-airline similarity index 100% rename from .vim/pack/plugins/start/vim-airline rename to .vim/pack/github/opt/vim-airline diff --git a/.vim/pack/plugins/start/vim-fugitive b/.vim/pack/github/opt/vim-fugitive similarity index 100% rename from .vim/pack/plugins/start/vim-fugitive rename to .vim/pack/github/opt/vim-fugitive diff --git a/.vim/pack/plugins/start/vim-unimpaired b/.vim/pack/github/opt/vim-unimpaired similarity index 100% rename from .vim/pack/plugins/start/vim-unimpaired rename to .vim/pack/github/opt/vim-unimpaired 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 -- 2.43.0