diff --git a/.aliases b/.aliases index 92dfcdb..6adce87 100644 --- a/.aliases +++ b/.aliases @@ -5,10 +5,12 @@ alias agL="dpkg --listfiles" alias agu="sudo apt-get update && sudo apt-get upgrade" alias al="zsh_stats" alias c="clear" +alias g="g" # overwrite g alias in git plugin so function will work alias ga="git add" alias gaa="git add ." alias gcf="git commit --file" alias gcm="git commit --message" +alias gco="git checkout" alias gd="git diff" alias gl="git log" alias gh="git hist" @@ -18,6 +20,7 @@ alias l="ls" alias ll="ls -lv --human-readable --color=auto" alias mw="mux work" alias s="cd ~/Source" +alias sz="source ~/.zshrc" alias t="tmux" alias v="vim" alias x="exit" diff --git a/.vimrc b/.vimrc index adddfa1..9b077b2 100644 --- a/.vimrc +++ b/.vimrc @@ -7,7 +7,7 @@ Bundle 'gmarik/vundle' Bundle 'airblade/vim-gitgutter' Bundle 'godlygeek/tabular' Bundle 'kien/ctrlp.vim' -Bundle 'puppetlabs/puppet-syntax-vim' +Bundle 'rodjek/vim-puppet' Bundle 'tpope/vim-rails' Bundle 'tpope/vim-repeat' Bundle 'tpope/vim-surround' diff --git a/tool-sharpener.txt b/tool-sharpener.txt index 55b943d..6e74896 100644 --- a/tool-sharpener.txt +++ b/tool-sharpener.txt @@ -1,7 +1,5 @@ * Auto start tmux * * if [[ $STY = '' ]] then mux work; fi * insert-sudo function return to end of line -* git checkout bind * vi mode on command line * * set -o vi -* source keybinds