]> git.zndr.dk Git - dotfiles.git/commitdiff
Move vim packages to opt
authorJannik ZANDER <jzander@grundfos.com>
Sat, 7 Jul 2018 06:50:36 +0000 (08:50 +0200)
committerJannik ZANDER <jzander@grundfos.com>
Sat, 7 Jul 2018 06:50:36 +0000 (08:50 +0200)
24 files changed:
.gitmodules
.vim/pack/github/opt/Tortoise-Typing [new submodule]
.vim/pack/github/opt/ale [new submodule]
.vim/pack/github/opt/ctrlp.vim [new submodule]
.vim/pack/github/opt/editorconfig-vim [new submodule]
.vim/pack/github/opt/incsearch.vim [new submodule]
.vim/pack/github/opt/ropevim [new submodule]
.vim/pack/github/opt/tagbar [new submodule]
.vim/pack/github/opt/ultisnips [new submodule]
.vim/pack/github/opt/vim-airline [new submodule]
.vim/pack/github/opt/vim-fugitive [new submodule]
.vim/pack/github/opt/vim-unimpaired [new submodule]
.vim/pack/plugins/opt/ultisnips [deleted submodule]
.vim/pack/plugins/start/Tortoise-Typing [deleted submodule]
.vim/pack/plugins/start/ale [deleted submodule]
.vim/pack/plugins/start/ctrlp.vim [deleted submodule]
.vim/pack/plugins/start/editorconfig-vim [deleted submodule]
.vim/pack/plugins/start/incsearch.vim [deleted submodule]
.vim/pack/plugins/start/ropevim [deleted submodule]
.vim/pack/plugins/start/tagbar [deleted submodule]
.vim/pack/plugins/start/vim-airline [deleted submodule]
.vim/pack/plugins/start/vim-fugitive [deleted submodule]
.vim/pack/plugins/start/vim-unimpaired [deleted submodule]
.vim/vimrc

index 7958422ce9b235146b270d7e898b9d96b24894f9..4522e9911e568605dea24954a3a28d941f714d14 100644 (file)
@@ -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 (submodule)
index 0000000..3ec01ed
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 3ec01ed3ff192620194e538670ed331d658e7f13
diff --git a/.vim/pack/github/opt/ale b/.vim/pack/github/opt/ale
new file mode 160000 (submodule)
index 0000000..22533f2
--- /dev/null
@@ -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 (submodule)
index 0000000..e66b5b5
--- /dev/null
@@ -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 (submodule)
index 0000000..0abb063
--- /dev/null
@@ -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 (submodule)
index 0000000..25e2547
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 25e2547fb0566460f5999024f7a0de7b3775201f
diff --git a/.vim/pack/github/opt/ropevim b/.vim/pack/github/opt/ropevim
new file mode 160000 (submodule)
index 0000000..ab87505
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit ab87505b4aff3695e1385a3e463a7f7d5c473ad9
diff --git a/.vim/pack/github/opt/tagbar b/.vim/pack/github/opt/tagbar
new file mode 160000 (submodule)
index 0000000..387bbad
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 387bbadda98e1376ff3871aa461b1f0abd4ece70
diff --git a/.vim/pack/github/opt/ultisnips b/.vim/pack/github/opt/ultisnips
new file mode 160000 (submodule)
index 0000000..6fdc364
--- /dev/null
@@ -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 (submodule)
index 0000000..45c9621
--- /dev/null
@@ -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 (submodule)
index 0000000..8fa5cad
--- /dev/null
@@ -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 (submodule)
index 0000000..f185e75
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit f185e75b87a092162099ca2781626253a5a41a67
diff --git a/.vim/pack/plugins/opt/ultisnips b/.vim/pack/plugins/opt/ultisnips
deleted file mode 160000 (submodule)
index 6fdc364..0000000
+++ /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 (submodule)
index 3ec01ed..0000000
+++ /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 (submodule)
index 22533f2..0000000
+++ /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 (submodule)
index e66b5b5..0000000
+++ /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 (submodule)
index 0abb063..0000000
+++ /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 (submodule)
index 25e2547..0000000
+++ /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 (submodule)
index ab87505..0000000
+++ /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 (submodule)
index 387bbad..0000000
+++ /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 (submodule)
index 45c9621..0000000
+++ /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 (submodule)
index 8fa5cad..0000000
+++ /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 (submodule)
index f185e75..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f185e75b87a092162099ca2781626253a5a41a67
index 5534c11e4dfd8677cfb2338af7deb56c86399471..9abf62d89a53293c8ea03b479ad6a557b6026ce6 100644 (file)
@@ -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 <leader>* :silent grep <cword> \| copen<CR><C-l>   " <C-l> redraws the screen
-
-" buffers
-nnoremap <Leader>b    :buffer<cr>
-
-" tags
-nnoremap <Leader>t    :tags<CR>
-
-" ctrl-p
-let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
-let g:ctrlp_map = '<c-p>'
-let g:ctrlp_cmd = 'CtrlP'
-
-" ctrl-hjkl to windows navigation and resizing
-nnoremap <C-h>    <C-w><C-h>
-nnoremap <C-j>    <C-w><C-j>
-nnoremap <C-k>    <C-w><C-k>
-nnoremap <C-l>    <C-w><C-l>
-
 " 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 <leader>r :<C-U>RangerChooser<CR>
 
+" 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 <leader>* :silent grep <cword> \| copen<CR><C-l>   " <C-l> 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 = '<c-p>'
+let g:ctrlp_cmd = 'CtrlP'
+
+" mappings
+" ---------------------
+let mapleader = ","
+
+" buffers
+nnoremap <Leader>b    :buffer<cr>
+
+" tags
+nnoremap <Leader>t    :tags<CR>
+
+" ctrl-hjkl to windows navigation and resizing
+nnoremap <C-h>    <C-w><C-h>
+nnoremap <C-j>    <C-w><C-j>
+nnoremap <C-k>    <C-w><C-k>
+nnoremap <C-l>    <C-w><C-l>
+
+
 " Maps Ctrl-[h,j,k,l,+,-] to windows split navigations and resizing
 nnoremap <C-H>    <C-W><C-H>
 nnoremap <C-J>    <C-W><C-J>
@@ -218,7 +221,6 @@ nnoremap <C-j>    :exe "resize " . (winheight(0) * 2/3)<CR>
 nnoremap <C-k>    :exe "resize " . (winheight(0) * 3/2)<CR>
 endif
 
-
 " folding
 noremap <space> za
 
@@ -226,7 +228,7 @@ noremap <space> 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