Added Xresources & tmux plugins

bash_aliases

@@ -1,4 +1,6 @@
 IP=$(hostname -I | cut -d' ' -f1)
+HOSTNAME=`hostname -s`
+
 alias ls="ls -alh"
 
 #Django stuff
@@ -60,7 +62,12 @@ doPsKill(){
 }
 alias pskill=doPsKill
 
-alias dockerx="docker --tlsverify -H=podnoms.com:2376 --tlscacert=/srv/sharing/docker-tls/podnoms/ca.pem --tlscert=/srv/sharing/docker-tls/podnoms/cert.pem --tlskey=/srv/sharing/docker-tls/podnoms/key.pem"
+alias dcx="docker-compose -H podnoms.com:2376 --tlsverify --tlscacert /mnt/niles/sharing/docker-tls/podnoms/ca.pem --tlscert /mnt/niles/sharing/docker-tls/podnoms/cert.pem --tlskey /mnt/niles/sharing/docker-tls/podnoms/key.pem"
+
+case $HOSTNAME in
+    (NILES) alias dockerx="docker --tlsverify -H=podnoms.com:2376 --tlscacert=/srv/sharing/docker-tls/podnoms/ca.pem --tlscert=/srv/sharing/docker-tls/podnoms/cert.pem --tlskey=/srv/sharing/docker-tls/podnoms/key.pem";;
+    (EDDIE) alias dockerx="docker --tlsverify -H=podnoms.com:2376 --tlscacert=/mnt/niles/sharing/docker-tls/podnoms/ca.pem --tlscert=/mnt/niles/sharing/docker-tls/podnoms/cert.pem --tlskey=/mnt/niles/sharing/docker-tls/podnoms/key.pem";;
+esac
 
 if type "$docker" >  /dev/null; then
     alias docker-nuke="docker rm $(docker ps -a -q) && docker rmi $(docker images -q)"

install.sh

@@ -5,7 +5,7 @@
 
 dir=~/dotfiles                    # dotfiles directory
 olddir=~/dotfiles_old             # old dotfiles backup directory
-files="tmux.conf zshrc bash_aliases bash_functions sqliterc"    # list of files/folders to symlink in homedir
+files="tmux.conf zshrc bash_aliases bash_functions sqliterc Xresources"    # list of files/folders to symlink in homedir
 
 ##########
 
@@ -27,6 +27,9 @@ for file in $files; do
     ln -s $dir/$file ~/.$file
 done
 
+# merge Xresources
+xrdb -merge ~/.Xresources
+
 sudo cp -r fonts/* /usr/share/fonts/opentype
 fc-cache -f -v
 sudo fc-cache -f -v
@@ -40,6 +43,9 @@ if [ ! -f $OMF ]; then
     sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
 fi
 
+#install tmux plugin manager
+git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+
 #install git flow completion
 git clone https://github.com/bobthecow/git-flow-completion ~/.oh-my-zsh/custom/plugins/git-flow-completion
 

tmux.conf

@@ -13,7 +13,6 @@ set -sg escape-time 0
 
 ## Status bar design
 # status line
-set -g status-utf8 on
 set -g status-justify left
 set -g status-bg default
 set -g status-fg colour12
@@ -129,3 +128,14 @@ set -g message-fg colour232
 set -g message-bg colour166
 
 # }
+
+
+# Setup tmux resurrect
+# List of plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+
+run '~/.tmux/plugins/tpm/tpm'
+
+

zshrc

@@ -56,6 +56,7 @@ plugins=(git, thefuck, git-flow-completion, virtualenvwrapper)
 source $ZSH/oh-my-zsh.sh
 source /usr/share/autojump/autojump.sh
 source /usr/local/bin/virtualenvwrapper.sh
+source ~/.oh-my-zsh/custom/plugins/git-flow-completion/git-flow-completion.zsh
 
 # Preferred editor for local and remote sessions
 if [[ -n $SSH_CONNECTION ]]; then