diff --git a/.aliases b/.aliases index 3740041..241f7f4 100644 --- a/.aliases +++ b/.aliases @@ -10,9 +10,13 @@ alias be="bundle exec" alias beg="bundle exec guard" alias ber="bundle exec rake" alias c="clear" +alias f="map-sshfs" +alias fn="map-sshfs netprint /data/www/ netprint && cd ~/Mounts/netprint" +alias fun="cd && fusermount -u ~/Mounts/netprint" alias g="g" # overwrite g alias in git plugin so function will work alias ga="git add" alias gaa="git add ." +alias gc="git commit" alias gcf="git commit --file" alias gcm="git commit --message" alias gco="git checkout" @@ -31,6 +35,7 @@ alias gw="git diff --check" alias Grep='grep' alias l="ls" alias ll="ls -lv --human-readable --color=auto" +alias m="more" alias ms="tmux -S /tmp/pair && chmod 777 /tmp/pair" alias mw="tmux attach-session -t work || tmux new-session -s work" alias rd="popd" diff --git a/.functions b/.functions index d3ac612..a8ee23c 100644 --- a/.functions +++ b/.functions @@ -17,5 +17,9 @@ function port-forward { } function map-sshfs { - sshfs -o idmap=user -o workaround=rename $USER'@'$1':'$2 $HOME'/Mounts/'$3 + if [ $# -eq 0 ]; then + echo Usage: map-sshfs HOST DIRECTORY MOUNT + else + sshfs -o idmap=user -o workaround=rename $USER'@'$1':'$2 $HOME'/Mounts/'$3 + fi } diff --git a/.vimrc b/.vimrc index 0e2ec01..1f7694d 100644 --- a/.vimrc +++ b/.vimrc @@ -81,16 +81,20 @@ map let mapleader = "," map bi :BundleInstall +map bu :BundleInstall! map c "+ map fw :FixWhitespace map i mmgg=G`m map lf :call LargeFileToggle() map p "+p +map pm :set paste! map s :e ~/Source/ map sa :call RenameFile() map se :e ~/.vimrc map sz :so ~/.vimrc map t :Tabularize / +map t> :Tabularize /=> +map te :Tabularize /= map ts :sp ~/tool-sharpener.txt " Set style diff --git a/.zshrc b/.zshrc index 89777d6..f91bbb0 100644 --- a/.zshrc +++ b/.zshrc @@ -14,6 +14,10 @@ else export PATH="$HOME/.rvenv/bin:$PATH" fi +if test -d /soft/linux/pkg/bin ; then + export PATH=/soft/linux/pkg/bin:${PATH}; +fi + # List directory when changing (github/r00k) chpwd() { ls -lvh --color=auto