From 14b0b4b9bda2ff08d6d817b56253c84eaab2a005 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Fri, 31 Jul 2015 16:52:21 -0400
Subject: [PATCH] Fixes

---
 shells/zshrc | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/shells/zshrc b/shells/zshrc
index 853c27e..c4e08ae 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -53,15 +53,7 @@ if [ "$(uname)" != "Darwin" ]; then
   alias matlab='matlab -glnx86'
   alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT0| grep -E "state|to\ full|percentage"'
 fi
-if test -f /etc/lsb-release; then
-  # Ubuntu
-  alias install='sudo apt-get --show-progress install'
-  alias remove='sudo apt-get --show-progress remove'
-  alias update='sudo apt-get update'
-  alias upgrade='sudo apt-get --show-progress upgrade'
-  alias autoremove='sudo apt-get --show-progress autoremove'
-  alias updateall='sudo sh -c "apt-get update;apt-get upgrade -y;apt-get dist-upgrade -y;apt-get autoremove -y"'
-elif test -f /etc/gentoo-release; then
+if test -f /etc/gentoo-release; then
   # Gentoo
   ins(){
     echo "args: $*"
@@ -69,6 +61,14 @@ elif test -f /etc/gentoo-release; then
   }
   alias update='cd /usr/portage&&sudo zsh -c "git up&&eix-update";\cd ->/dev/null'
   alias upgrade='sudo emerge --update --newuse --with-bdeps=y --deep --verbose -t -a --keep-going=y @world'
+elif test -f /etc/lsb-release; then
+  # Ubuntu
+  alias install='sudo apt-get --show-progress install'
+  alias remove='sudo apt-get --show-progress remove'
+  alias update='sudo apt-get update'
+  alias upgrade='sudo apt-get --show-progress upgrade'
+  alias autoremove='sudo apt-get --show-progress autoremove'
+  alias updateall='sudo sh -c "apt-get update;apt-get upgrade -y;apt-get dist-upgrade -y;apt-get autoremove -y"'
 fi
 alias ..='k ..'
 alias ...='k ../..'
@@ -220,7 +220,7 @@ function k(){
     vim "$@"
   fi
 }
-source ~/.zsh/*.zsh
+#source ~/.zsh/*.zsh
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 printf "git-annex..."
 antigen bundle Schnouki/git-annex-zsh-completion
@@ -239,3 +239,4 @@ antigen bundle zsh-users/zsh-syntax-highlighting
 printf "applying..."
 antigen apply
 echo "done"
+for config (~/.zsh/*.zsh) source $config