diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | git_template/hooks/ctags | 8 | ||||
| -rwxr-xr-x | git_template/hooks/post-checkout | 2 | ||||
| -rwxr-xr-x | git_template/hooks/post-commit | 2 | ||||
| -rwxr-xr-x | git_template/hooks/post-merge | 2 | ||||
| -rwxr-xr-x | git_template/hooks/post-rewrite | 4 | ||||
| -rw-r--r-- | gitconfig | 4 | ||||
| -rwxr-xr-x | make | 4 | ||||
| -rw-r--r-- | vimrc | 7 |
9 files changed, 28 insertions, 6 deletions
@@ -1,5 +1,6 @@ mutt/cache/ mutt/mailboxes/ +vim/vimundo/* vim/bundle/ vifm/Trash vifm/vimfiles diff --git a/git_template/hooks/ctags b/git_template/hooks/ctags new file mode 100755 index 0000000..a9a2150 --- /dev/null +++ b/git_template/hooks/ctags @@ -0,0 +1,8 @@ +#!/bin/sh +set -e +PATH="/usr/local/bin:$PATH" +dir="`git rev-parse --git-dir`" +trap 'rm -f "$dir/$$.tags"' EXIT +git ls-files | ctags --tag-relative -L - -f"$dir/$$.tags" --languages=-javascript,sql +mv "$dir/$$.tags" "$dir/tags" + diff --git a/git_template/hooks/post-checkout b/git_template/hooks/post-checkout new file mode 100755 index 0000000..84f17ed --- /dev/null +++ b/git_template/hooks/post-checkout @@ -0,0 +1,2 @@ +#!/bin/sh +.git/hooks/ctags >/dev/null 2>&1 & diff --git a/git_template/hooks/post-commit b/git_template/hooks/post-commit new file mode 100755 index 0000000..84f17ed --- /dev/null +++ b/git_template/hooks/post-commit @@ -0,0 +1,2 @@ +#!/bin/sh +.git/hooks/ctags >/dev/null 2>&1 & diff --git a/git_template/hooks/post-merge b/git_template/hooks/post-merge new file mode 100755 index 0000000..84f17ed --- /dev/null +++ b/git_template/hooks/post-merge @@ -0,0 +1,2 @@ +#!/bin/sh +.git/hooks/ctags >/dev/null 2>&1 & diff --git a/git_template/hooks/post-rewrite b/git_template/hooks/post-rewrite new file mode 100755 index 0000000..fe8972d --- /dev/null +++ b/git_template/hooks/post-rewrite @@ -0,0 +1,4 @@ +#!/bin/sh +case "$1" in + rebase) exec .git/hooks/post-merge ;; +esac @@ -1,3 +1,7 @@ [user] name = Urbain Vaes email = u.vaes13@imperial.ac.uk +[init] + templatedir = ~/.git_template +[alias] + ctags = !.git/hooks/ctags @@ -4,7 +4,7 @@ dir=~/dotfiles olddir=~/dotfiles_old # Files to sync -files="vim vimrc mutt passwords vifm msmtprc bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc offlineimap.py inputrc latexmkrc crontab gitconfig tmuxlinerc" +files="vim vimrc mutt passwords vifm msmtprc bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc offlineimap.py inputrc latexmkrc crontab gitconfig git_template tmuxlinerc" rm -rf $olddir mkdir -p $olddir @@ -41,7 +41,7 @@ cd mutt mkdir temp # Tmux -cd +cd rm -rf .tmux git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm tmux source-file ~/.tmux.conf @@ -136,22 +136,21 @@ set nowrap set linebreak set textwidth=0 set conceallevel=2 +set formatprg=par\ w70 set guifont=Monaco\ 11 -set lazyredraw -highlight diffAdded guifg=#00bf00 -highlight diffRemoved guifg=#bf0000 " Case and spell set nospell set smartcase set ignorecase -" General +" Misc set noautochdir set cpoptions+=I set encoding=utf-8 set mouse=a set clipboard=unnamedplus +set lazyredraw " Leader-maps |