diff --git a/.gitmodules b/.gitmodules index 713f487..4e5fc65 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ [submodule "vim/pack/plugins/start/vim-gnupg"] path = vim/pack/plugins/start/vim-gnupg url = https://github.com/jamessan/vim-gnupg +[submodule "vim/pack/plugins/start/vim-soa"] + path = vim/pack/plugins/start/vim-soa + url = git@git.schuerz.at:/public/vim-soa.git diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index 92ed232..05297d9 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -18,7 +18,7 @@ #MSC_LOGFILE="${MSC_LOGDIR}/git.log" [ -d "${MSC_LOGDIR}" ] || mkdir -p "${MSC_LOGDIR}" [ -z "${MSC_GIT_REMOTE_NAME+x}" ] && export MSC_GIT_REMOTE_NAME=origin -[ -z "${MSC_GIT_BRANCH+x}" ] && export MSC_GIT_BRANCH=master +[ -z "${MSC_GIT_BRANCH:+x}" ] && export MSC_GIT_BRANCH=master @@ -90,6 +90,7 @@ fi #echo $SGIT fetch ${MSC_GIT_REMOTE_NAME} -p 1>&2 if $dorepoupdate; then loginfo "fetch repo${dosubmodupdate:+ and submodules}" + #$SGIT fetch ${dosubmodupdate:+--recurse-submodules} ${MSC_GIT_REMOTE_NAME} -p 2>>"${MSC_LOGFILE}"|| { logwarn fetch failed; gitupdateend; exit 1; } $SGIT fetch ${dosubmodupdate:+--recurse-submodules} ${MSC_GIT_REMOTE_NAME} -p 2>>"${MSC_LOGFILE}"|| { logwarn fetch failed; gitupdateend; exit 1; } if ${dosubmodupdate:-false}; then lastupdatesubmodules @@ -99,7 +100,7 @@ if $dorepoupdate; then if $SGIT diff-index --ignore-submodules --exit-code HEAD -- >> "${MSC_LOGFILE}" ; then cat << EOF >> "${MSC_LOGFILE}" no changes in local repo - $SGIT checkout repo ${PRE}${PRE:+/}${MSC_GIT_BRANCH} + $SGIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH} EOF $SGIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH} 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 2; } $SGIT merge FETCH_HEAD 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 3; } diff --git a/bin/git-submodule-fix b/bin/git-submodule-fix new file mode 100755 index 0000000..889575a --- /dev/null +++ b/bin/git-submodule-fix @@ -0,0 +1,7 @@ +#!/bin/bash + +for arg +do + echo $arg + find . -name "`basename $arg`" | grep "$arg\$" | xargs rm -fr +done diff --git a/tmux/plugins/tmux-sensible b/tmux/plugins/tmux-sensible index 989d092..e91b178 160000 --- a/tmux/plugins/tmux-sensible +++ b/tmux/plugins/tmux-sensible @@ -1 +1 @@ -Subproject commit 989d09249e9389604a68d281c999978f6231431b +Subproject commit e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5 diff --git a/tmux/plugins/tmux-themepack b/tmux/plugins/tmux-themepack index 7c59902..1b1b809 160000 --- a/tmux/plugins/tmux-themepack +++ b/tmux/plugins/tmux-themepack @@ -1 +1 @@ -Subproject commit 7c59902f64dcd7ea356e891274b21144d1ea5948 +Subproject commit 1b1b8098419daacb92ca401ad6ee0ca6894a40ca diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm index 108f76b..693e5a2 160000 --- a/tmux/plugins/tpm +++ b/tmux/plugins/tpm @@ -1 +1 @@ -Subproject commit 108f76b628a0df927df142036f1fdec829a5ff00 +Subproject commit 693e5a2a0f6acfd2666882655d5dfd32e8c6c50b diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 7191ebb..3f90fb4 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 7191ebb615f5d6ebbf51d598d8ec853a65e2274d +Subproject commit 3f90fb42d8871920138ace9878502f22a4d91e85 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index e34f6c1..b1afeca 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit e34f6c129d39b90db44df1107c8b7dfacfd18946 +Subproject commit b1afeca8cc02030f450bf1feee015d40988f86e3 diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index 2c14ed0..0e71462 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit 2c14ed0e153cdcd0a1c7d1eabec6820bb6b3f8a2 +Subproject commit 0e71462f90fb4bd09121eeba829512cc24ab5c97 diff --git a/vim/pack/plugins/start/nerdtree-git-plugin b/vim/pack/plugins/start/nerdtree-git-plugin index ff9b14f..e1fe727 160000 --- a/vim/pack/plugins/start/nerdtree-git-plugin +++ b/vim/pack/plugins/start/nerdtree-git-plugin @@ -1 +1 @@ -Subproject commit ff9b14f14dceecb6c08cb05053ad649c3b6ac250 +Subproject commit e1fe727127a813095854a5b063c15e955a77eafb diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 0cfd829..0de4c9d 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 0cfd829c92a6fd208bfdcbdd2881105462224636 +Subproject commit 0de4c9df21abf9256091d205148601f718d3a12c diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 4adf054..d523fee 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 4adf054a3f6f6ecad303e3e90c169cdf37f6c0e9 +Subproject commit d523feebe99bb93a9309ef83cbac2b71ac408c36 diff --git a/vim/pack/plugins/start/vim-soa b/vim/pack/plugins/start/vim-soa new file mode 160000 index 0000000..429a874 --- /dev/null +++ b/vim/pack/plugins/start/vim-soa @@ -0,0 +1 @@ +Subproject commit 429a874ac32d6e3c3cf117b2d83ed70212380ad9 diff --git a/vimplugins b/vimplugins index f787501..a8f8fe5 100644 --- a/vimplugins +++ b/vimplugins @@ -17,3 +17,4 @@ install plugins https://github.com/junegunn/fzf.vim.git install plugins https://github.com/airblade/vim-gitgutter.git remove plugins https://github.com/Lokaltog/powerline.git install plugins https://github.com/jamessan/vim-gnupg +install plugins git@git.schuerz.at:/public/vim-soa.git diff --git a/vimrc b/vimrc index 672475c..172f7d1 100644 --- a/vimrc +++ b/vimrc @@ -539,3 +539,5 @@ let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.6 } } " Configure Gitgutter nmap hn (GitGutterNextHunk) nmap hp (GitGutterPrevHunk) + +autocmd BufWritePre /etc/bind/vpn/db.* Soa