11 files changed, 38 insertions, 21 deletions

diff --git a/.spacemacs b/.spacemacs
index 8884659..8884659 100644..100755
--- a/.spacemacs
+++ b/.spacemacs
diff --git a/amethyst b/amethyst
index 5631413..5631413 100644..100755
--- a/amethyst
+++ b/amethyst
diff --git a/common_move_in.sh b/common_move_in.sh
index 90e1c95..26eb153 100755
--- a/common_move_in.sh
+++ b/common_move_in.sh
@@ -23,6 +23,12 @@ else
 fi
 CWD=`pwd`
 
+if ! [ -e "$HOME/bin"]; then
+    mkdir $HOME/bin/
+    cd $HOME/bin/
+    curl -O http://orgmode.org/worg/code/awk/ical2org.awk
+fi
+
 if ! [ -e "$HOME/.vimrc" ]; then
     echo "Linking vim settings..."
     ln -s $CWD/vim $HOME/.vim
diff --git a/geeklets/epl_table.py b/geeklets/epl_table.py
index 5251bac..5251bac 100644..100755
--- a/geeklets/epl_table.py
+++ b/geeklets/epl_table.py
diff --git a/os-x_move_in.sh b/os-x_move_in.sh
index 203ad79..8b16c6a 100755
--- a/os-x_move_in.sh
+++ b/os-x_move_in.sh
@@ -30,20 +30,17 @@ else
     brew cask install \
         alfred \
         caffeine \
-        clipmenu \
         dash \
         displaylink \
         evernote \
         gfxcardstatus \
         google-chrome \
-        intellij-idea \
         iterm2 \
         itsycal \
         lastpass \
         nicecast \
         mou \
         musicbrainz-picard \
-        p4merge \
         rescuetime \
         spamsieve \
         steam \
@@ -57,11 +54,22 @@ else
         vmware-fusion
 
     brew install \
-        git \
-        mercurial \
-        pt \
-        ag \
-        ack
+         git \
+         git-extras \
+         mercurial \
+         pt \
+         the_silver_searcher \
+         ack \
+         procmail \
+         fetchmail \
+         msmtp \
+         editorconfig \
+         direnv \
+         w3m \
+         tmux \
+         nmap \
+         gnutls \
+         hunspell
 
     brew install --HEAD mobile-shell
 
diff --git a/vim/colors/synic.vim b/vim/colors/synic.vim
index 719a529..719a529 100644..100755
--- a/vim/colors/synic.vim
+++ b/vim/colors/synic.vim
diff --git a/vim/vimrc b/vim/vimrc
index 4e1757c..4e1757c 100644..100755
--- a/vim/vimrc
+++ b/vim/vimrc
diff --git a/xchat2/colors.conf b/xchat2/colors.conf
index b591713..b591713 100644..100755
--- a/xchat2/colors.conf
+++ b/xchat2/colors.conf
diff --git a/xchat2/enc.py b/xchat2/enc.py
deleted file mode 120000
index 61623bb..0000000
--- a/xchat2/enc.py
+++ /dev/null
@@ -1 +0,0 @@
-/home/jason/Code/enc/enc.py
\ No newline at end of file
diff --git a/xchat2/pevents.conf b/xchat2/pevents.conf
index ff5afde..ff5afde 100644..100755
--- a/xchat2/pevents.conf
+++ b/xchat2/pevents.conf
diff --git a/zshrc b/zshrc
index 5d0fe6d..5d7dfde 100644..100755
--- a/zshrc
+++ b/zshrc
@@ -1,6 +1,5 @@
 # Path to your oh-my-zsh installation.
 
-
 # Set name of the theme to load.
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
@@ -54,7 +53,9 @@ ZSH=~/.oh-my-zsh
 
 source $ZSH/oh-my-zsh.sh
 
-export PATH="~/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/local/MacGPG2/bin"
+export RUST_SRC_PATH="$HOME/Code/rust-lang/src"
+
+export PATH="$HOME/bin:$HOME/.cargo/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/games"
 export MANPATH="/usr/local/man:$MANPATH"
 
 export LANG=en_US.UTF-8
@@ -65,12 +66,12 @@ export LANG=en_US.UTF-8
 # else
 #   export EDITOR='mvim'
 # fi
-export EDITOR='/Applications/Emacs\ 25.app/Contents/MacOS/bin/emacsclient'
+#export EDITOR='/Applications/Emacs\ 25.app/Contents/MacOS/bin/emacsclient'
+export EDITOR='emacsclient'
 
 # Compilation flags
 # export ARCHFLAGS="-arch x86_64"
 
-# export PATH="/usr/local/Cellar/python/2.7.9/bin:/usr/local/opt/go/libexec/bin:/usr/local/heroku/bin:$PATH"
 export VAGRANT_DOTFILE_PATH=~/.vagrant.d/projects
 
 #export SSL_CERT_FILE=/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt
@@ -79,16 +80,19 @@ 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 bib='source ~/.virtualenvs/bib/bin/activate'
 alias ducks='du -cks * |sort -rn |head -11'
-source /usr/local/bin/virtualenvwrapper_lazy.sh
-
-PATH="/Users/jason/perl5/bin${PATH+:}${PATH}"; export PATH;
-PERL5LIB="/Users/jason/perl5/lib/perl5${PERL5LIB+:}${PERL5LIB}"; export PERL5LIB;
-PERL_LOCAL_LIB_ROOT="/Users/jason/perl5${PERL_LOCAL_LIB_ROOT+:}${PERL_LOCAL_LIB_ROOT}"; export PERL_LOCAL_LIB_ROOT;
-PERL_MB_OPT="--install_base \"/Users/jason/perl5\""; export PERL_MB_OPT;
-PERL_MM_OPT="INSTALL_BASE=/Users/jason/perl5"; export PERL_MM_OPT;
+source /usr/share/virtualenvwrapper/virtualenvwrapper.sh
 
 # emacsclient is a script located in ~/bin
 alias emacs='emacsclient -nw'
 alias dc='docker-compose'
-. ~/.cargo/env
+#. ~/.cargo/env
 eval "$(direnv hook zsh)"
+
+if [ -f "${HOME}/.gpg-agent-info" ]; then
+  . "${HOME}/.gpg-agent-info"
+  export GPG_AGENT_INFO
+  export SSH_AUTH_SOCK
+fi
+export GPG_TTY=$(tty)
+export COMPOSE_HTTP_TIMEOUT=600
+export DOCKER_CLIENT_TIMEOUT=120