From 1bf5da182aec35eeb157e59b291f3ed80864cbcc Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sun, 8 Oct 2017 19:27:15 +0100
Subject: [PATCH] Clean up shell

---
 modules/shell/files/applications.sh | 9 +--------
 modules/shell/files/base.sh         | 9 ---------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/modules/shell/files/applications.sh b/modules/shell/files/applications.sh
index 9b0b6e8..b0c2069 100644
--- a/modules/shell/files/applications.sh
+++ b/modules/shell/files/applications.sh
@@ -8,9 +8,6 @@ export PATH="$HOME/.pyenv/bin:$PATH"
 eval "$(pyenv init -)"
 eval "$(pyenv virtualenv-init -)"
 
-[ -s "/usr/share/autoenv-git/activate.sh" ] && source /usr/share/autoenv-git/activate.sh
-
-
 # git aliases
 alias gs="git status"
 alias gd="git diff"
@@ -38,12 +35,8 @@ gd-unlock() {
 alias gdl="gd-lock"
 alias gdu="gd-unlock"
 
-alias y="yoga"
-alias ym="yoga mode"
-
-
 # miscellaneous software aliases
-alias serve="python2 -m SimpleHTTPServer"
+alias serve="/usr/bin/python2 -m SimpleHTTPServer"
 alias vi="vim"
 alias regen-ssh-conf="assh config build > ~/.ssh/config"
 alias yolo="yaourt -Syyau --noconfirm"
diff --git a/modules/shell/files/base.sh b/modules/shell/files/base.sh
index 7e30f47..bae20bf 100644
--- a/modules/shell/files/base.sh
+++ b/modules/shell/files/base.sh
@@ -4,14 +4,12 @@ case $- in
   *) return;;
 esac
 
-
 # Export some variables
 export ANDROID_HOME=/opt/android-sdk
 export EDITOR=/bin/nano
 export TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S'
 export DOTFILES=~/.dotfiles
 
-
 # Extend path
 export PATH=${PATH}:${ANDROID_HOME}/tools
 export PATH=${PATH}:${ANDROID_HOME}/platform-tools
@@ -21,21 +19,14 @@ export PATH=${PATH}:${HOME}/.bin
 # bash aliases
 alias refresh="cd $PWD > /dev/null"
 alias c="clear"
-alias cls="clear"
 alias e="exit"
-alias please="sudo"
 alias no="yes n"
-alias drugs="yes no"
 alias open="xdg-open"
 alias browse "xdg-open ."
 
 # colourify things!
 alias ls='ls --color=auto'
-alias dir='dir --color=auto'
-alias vdir='vdir --color=auto'
 alias grep='grep --color=auto'
-alias fgrep='fgrep --color=auto'
-alias egrep='egrep --color=auto'
 
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'