diff options
| -rw-r--r-- | bashrc | 49 |
1 files changed, 12 insertions, 37 deletions
diff --git a/bashrc b/bashrc index e9a1882..224d286 100644 --- a/bashrc +++ b/bashrc @@ -6,9 +6,9 @@ export LC_CTYPE="$LANG" export PAGER="less" export TMPDIR="${HOME}/tmp" export TZ=America/Los_Angeles -export TERM="xterm-256color" +export GOPATH="${HOME}" -export PATH="$HOME/bin":"$HOME/.bin":"$PATH" +export PATH="${HOME}/bin:${HOME}/src/bin:/opt/twitter/bin:~/src/source/dist:/opt/twitter/opt/go/libexec/bin:${PATH}" [ -z "$PS1" ] && return @@ -49,6 +49,11 @@ else alias ls='ls --color' fi +# editor +alias e="$EDITOR" +alias et="TERM=xterm-256color emacsclient -nw" + +# generic commands alias cp="cp -i" alias l="ls" alias la="ls -a" @@ -57,45 +62,15 @@ alias lt="ls -lhtr" alias mv="mv -i" alias rm="rm -i" -alias e="$EDITOR" -alias et="TERM=xterm-256color emacsclient -nw" - -alias g="git" -alias gclean="git clean -dfx" -alias gst="git status" - +# tools alias gerp="grep --color=auto" alias grep="grep --color=auto" - alias pjson="python -mjson.tool" -alias s="cd ~/src/source" -alias eb="cd ~/src/source/eventbus" -alias ops="cd ~/src/twitter-ops" -# tmux -alias tmux='tmux -2' -alias tmuxl='tmux new -A -s local' -alias tmuxr='tmux new -A -s remote' +# git +alias g="git" +alias gclean="git clean -dfx" +alias gst="git status" # local stuff [ -f "${HOME}/.bash_local" ] && source "${HOME}/.bash_local" - -function gitme { - git config --local user.email "franckcuny@gmail.com" - git config --local user.name "Franck Cuny" -} - -function puppet-master { - local hostlist=$1 - if [[ -z "${hostlist}" ]]; then - echo "host list is missing" - return 1 - fi - - batch_size=$(sed -n '$=' "${hostlist}") - if [[ "${batch_size}" -gt 10 ]]; then - batch_size=10 - fi - loony -F "${hostlist}" -t "${batch_size}" run sudo puppet-util run -} - |