some changes
This commit is contained in:
parent
a1d72c9f0d
commit
614a2a8689
4 changed files with 16 additions and 7 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -55,3 +55,6 @@
|
||||||
[submodule "vim/pack/plugins/start/vim-gitgutter"]
|
[submodule "vim/pack/plugins/start/vim-gitgutter"]
|
||||||
path = vim/pack/plugins/start/vim-gitgutter
|
path = vim/pack/plugins/start/vim-gitgutter
|
||||||
url = https://github.com/airblade/vim-gitgutter.git
|
url = https://github.com/airblade/vim-gitgutter.git
|
||||||
|
[submodule "vim/pack/color/start/vim-colors-solarized"]
|
||||||
|
path = vim/pack/color/start/vim-colors-solarized
|
||||||
|
url = https://github.com/altercation/vim-colors-solarized.git
|
||||||
|
|
|
@ -13,7 +13,7 @@ logdebug "Remove entry for submodule from .gitmodules, if exist"
|
||||||
loginfo "$(git config --file=.gitmodules --remove-section submodule.${SUBMODULE})"
|
loginfo "$(git config --file=.gitmodules --remove-section submodule.${SUBMODULE})"
|
||||||
|
|
||||||
loginfo "$(git commit .gitmodules -m 'remove submodule-entry for '"$SUBMODULE"' from .gitconfig')"
|
loginfo "$(git commit .gitmodules -m 'remove submodule-entry for '"$SUBMODULE"' from .gitconfig')"
|
||||||
logdebug "Remove entry for submodule from .git/confi, if exist"
|
logdebug "Remove entry for submodule from .git/config, if exist"
|
||||||
[[ $(git config --get submodule.${SUBMODULE}.url >/dev/null 2>&1; echo $?) -eq 0 \
|
[[ $(git config --get submodule.${SUBMODULE}.url >/dev/null 2>&1; echo $?) -eq 0 \
|
||||||
|| $(git config --get submodule.${SUBMODULE}.path >/dev/null 2>&1; echo $?) -eq 0 ]] && \
|
|| $(git config --get submodule.${SUBMODULE}.path >/dev/null 2>&1; echo $?) -eq 0 ]] && \
|
||||||
loginfo "$(git config --remove-section submodule.${SUBMODULE})"
|
loginfo "$(git config --remove-section submodule.${SUBMODULE})"
|
||||||
|
|
1
vim/pack/color/start/vim-colors-solarized
Submodule
1
vim/pack/color/start/vim-colors-solarized
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
|
17
vimrc
17
vimrc
|
@ -389,20 +389,22 @@ autocmd FileType human set formatoptions-=t textwidth=0 "disable wrapping in txt
|
||||||
autocmd BufRead,BufNewFile *.conf setf dosini
|
autocmd BufRead,BufNewFile *.conf setf dosini
|
||||||
|
|
||||||
" to make comments better visible on dark backgrounds
|
" to make comments better visible on dark backgrounds
|
||||||
:color desert
|
":color desert
|
||||||
|
|
||||||
if has('gui_running')
|
if has('gui_running')
|
||||||
set background=dark
|
set background=dark
|
||||||
colorscheme solarized
|
colorscheme solarized
|
||||||
else
|
else
|
||||||
if !empty(glob("~/vim//bundle/Zenburn/colors/zenburn.vim"))
|
if !empty(glob("~/vim/pack/color/start/Zenburn"))
|
||||||
colorscheme zenburn
|
colorscheme zenburn
|
||||||
|
else
|
||||||
|
colorscheme desert
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if !empty(glob("~/.vim/bundle/vim-togglebg"))
|
"if !empty(glob("~/.vim/bundle/vim-togglebg"))
|
||||||
call togglebg#map("<F5>")
|
" call togglebg#map("<F5>")
|
||||||
endif
|
"endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -513,7 +515,6 @@ noremap <C-Tab> :tabnext<CR>
|
||||||
noremap <silent> <C-A-S-Tab> :execute 'silent! tabmove' . (tabpagenr()-2)<CR>
|
noremap <silent> <C-A-S-Tab> :execute 'silent! tabmove' . (tabpagenr()-2)<CR>
|
||||||
noremap <silent> <C-A-Tab> :execute 'silent! tabmove' . (tabpagenr()+1)<CR>
|
noremap <silent> <C-A-Tab> :execute 'silent! tabmove' . (tabpagenr()+1)<CR>
|
||||||
|
|
||||||
|
|
||||||
" Configure Plugin airline
|
" Configure Plugin airline
|
||||||
let g:airline_powerline_fonts=1
|
let g:airline_powerline_fonts=1
|
||||||
let g:airline#extensions#tabline#enabled = 1
|
let g:airline#extensions#tabline#enabled = 1
|
||||||
|
@ -522,3 +523,7 @@ let g:airline_theme='angr'
|
||||||
" Configure fzf - fuzzy finder
|
" Configure fzf - fuzzy finder
|
||||||
let g:fzf_preview_window = 'right:50%'
|
let g:fzf_preview_window = 'right:50%'
|
||||||
let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.6 } }
|
let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.6 } }
|
||||||
|
|
||||||
|
" Configure Gitgutter
|
||||||
|
nmap <Leader>hn <Plug>(GitGutterNextHunk)
|
||||||
|
nmap <Leader>hp <Plug>(GitGutterPrevHunk)
|
||||||
|
|
Loading…
Reference in a new issue