diff --git a/zsh/aliases b/zsh/aliases index aa72588c..caa79ffe 100644 --- a/zsh/aliases +++ b/zsh/aliases @@ -8,12 +8,7 @@ alias sudo='sudo ' # Homebrew alias br='brew' -alias bru='brew update && brew upgrade' -update() { - brew update && brew upgrade --all - cd ~/.emacs.d && git pull && make - cd ~/.dotfiles && git pull -} +alias bru='brew update && brew upgrade --all' # Tools alias codekit='open -a CodeKit' @@ -29,7 +24,8 @@ if is-callable 'transmission-remote'; then alias bt='transmission-remote server' # pretty print torrent list on remote server - function btl { + btl() { + local results results=`transmission-remote server -l | \ awk 'NR > 1 { s = ""; for (i = 10; i <= NF; i++) s = s $i " "; print $9 " | " s }' | \ sed '$d' | \ @@ -47,6 +43,7 @@ fi unalias e v() { [ $# -eq 0 ] && vim . || vim $@ } e() { # emacs + local input [ ! $# -eq 0 ] && input=$@ emacsclient -n ${input:-.} } diff --git a/zsh/prompts/prompt_v0_setup b/zsh/prompts/prompt_v0_setup index 4b5198bc..63c010ef 100644 --- a/zsh/prompts/prompt_v0_setup +++ b/zsh/prompts/prompt_v0_setup @@ -46,9 +46,9 @@ function prompt_v0_setup { # Set editor-info parameters. zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b' - zstyle ':prezto:module:editor:info:keymap:primary' format '%B%F{red}$%f%b' + zstyle ':prezto:module:editor:info:keymap:primary' format '%B%F{red}❯%f%b' zstyle ':prezto:module:editor:info:keymap:primary:overwrite' format '%F{red}♺%f' - zstyle ':prezto:module:editor:info:keymap:alternate' format '%B%F{green}#%f%b' + zstyle ':prezto:module:editor:info:keymap:alternate' format '%B%F{green}❯%f%b' # Add newline before prompt precmd() { print "" } diff --git a/zshrc b/zshrc index 87075733..0a6dd6cb 100644 --- a/zshrc +++ b/zshrc @@ -26,6 +26,7 @@ if [ -d ~/.pyenv ]; then fi export ANDROID_HOME=/usr/local/opt/android-sdk +export ANDROID_SDK=/usr/local/Cellar/android-sdk/24.2 export PATH=$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$PATH export CXXFLAGS='-I/usr/local/include -L/usr/local/lib'