zsh update

1 files changed, 48 insertions, 23 deletions

diff --git a/zsh/.zshrc b/zsh/.zshrc
index f0d1f10..ec8b151 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -53,24 +53,28 @@ plugins=(git git-extras docker fabric gpg-agent pep8 pip pyenv pylint python vag
 ZSH=~/.oh-my-zsh
 
 source $ZSH/oh-my-zsh.sh
+export LANG=en_US.UTF-8
+export MANPATH="/usr/local/man:$MANPATH"
 
-# maybe this stuff should go in .profile. Emacs seems to read from that
-export RUST_SRC_PATH="$HOME/Code/rust-lang/src"
-if [ -f $HOME/.cargo/env ]; then
-    source $HOME/.cargo/env
-fi
-
-export GOROOT=/usr/local/go/
-export GOPATH=$HOME/Code/go
-
+# PATH setup
 export PATH="$HOME/bin:$HOME/.cargo/bin:/usr/local/go/bin/:$PATH"
 if [ -f /usr/local/go/bin/go ]; then
     export PATH="$PATH:$GOROOT/bin:$(go env GOPATH)/bin"
 fi
 
-export MANPATH="/usr/local/man:$MANPATH"
+# Rust
+if [ -f $HOME/.cargo/env ]; then
+    source $HOME/.cargo/env
+fi
 
-export LANG=en_US.UTF-8
+# maybe this stuff should go in .profile. Emacs seems to read from that
+if [ -x $HOME/.cargo/bin/rustup ]; then
+    export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src"
+fi
+
+# Golang
+#export GOROOT=/usr/local/go/
+#export GOPATH=$HOME/Code/go
 
 # Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
@@ -79,7 +83,8 @@ export LANG=en_US.UTF-8
 #   export EDITOR='mvim'
 # fi
 #export EDITOR='/Applications/Emacs\ 25.app/Contents/MacOS/bin/emacsclient'
-export EDITOR='emacsclient'
+export _TERM_EMACS='emacsclient -nw -a "emacs -nw"'
+export EDITOR=$_TERM_EMACS
 
 # Compilation flags
 # export ARCHFLAGS="-arch x86_64"
@@ -89,34 +94,35 @@ export VAGRANT_DOTFILE_PATH=~/.vagrant.d/projects
 #export SSL_CERT_FILE=/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt
 
 # Aliases
-alias fixfileperm='find /music -type f -exec chmod 0644 {} \;'
+#alias fixfileperm='find /music -type f -exec chmod 0644 {} \;'
 alias cleanbranches='git branch --merged | grep -v "\*" | xargs -n 1 git branch -d; git branch -r --merged master | grep -iv "master" | sed "s/origin\///" | xargs -n 1 git push --delete origin'
 alias ducks='du -cks * |sort -rn |head -11'
+alias dc='docker-compose'
+alias define='sdcv'
+alias emacs=$_TERM_EMACS
+alias java18='/usr/local/java/jdk1.8.0_191/bin/java'
+alias javac18='/usr/local/java/jdk1.8.0_191/bin/javac'
 
+# Python
 if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then
     source /usr/local/bin/virtualenvwrapper.sh
 elif [ -f /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh ]; then
     source /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh
 fi
 
-
-
-# emacsclient is a script located in ~/bin
-# alias emacs='emacsclient'
-
-alias dc='docker-compose'
-alias define='sdcv'
-
+# direnv
 DIRENV=`whereis -b direnv | awk {'print $2'}`
 if [[ -f $DIRENV && -x $DIRENV ]]; then
     eval "$(direnv hook zsh)"
 fi
 
+# GPG ssh key
 export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
 
 export GPG_TTY=$(tty)
-export COMPOSE_HTTP_TIMEOUT=600
-export DOCKER_CLIENT_TIMEOUT=120
+
+#export COMPOSE_HTTP_TIMEOUT=600
+#export DOCKER_CLIENT_TIMEOUT=120
 
 show_virtual_env() {
   if [ -n "$VIRTUAL_ENV" ]; then
@@ -127,3 +133,22 @@ show_virtual_env() {
 #PS1='$(show_virtual_env)'$PS1
 
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
+dg() {
+ // credit: doug tolton
+ dg_res=$(ls -1p \
+           | gawk -v target=$1 '$0 ~ target')
+ dg_res_count=$(echo $dg_res \
+                   | gawk 'length($0) > 0' \
+                   | wc -l)
+
+ if [[ "$dg_res_count" -eq 1 ]]
+ then
+   cd $(echo $dg_res)
+ elif [[ "$dg_res_count" -eq 0 ]]; then
+   echo "NO MATCHES"
+ else
+   echo $dg_res
+   echo "MATCHES: "$dg_res_count
+ fi
+}