consolodate bash aliases and cleanup

2 files changed, 8 insertions, 15 deletions

diff --git a/.bash_aliases b/.bash_aliases
index a89f9a1..5bf96d0 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -10,4 +10,11 @@ alias e="emacs"
 alias a="emacs -nw"
 alias demacs="emacs --daemon"
 alias ta="tmux attach"
-alias starte="startx -- -config egpu.conf"
\ No newline at end of file
+alias starte="startx -- -config egpu.conf"alias gs="git status"
+alias gl="git log --graph --oneline --all"
+alias pd="pushd"
+alias ppd="popd"
+alias up="cd .."
+alias a="emacsclient -n"
+alias ll="ls -la"
+alias ls="ls --color=auto"
diff --git a/.bashrc b/.bashrc
index 93fa496..2432332 100644
--- a/.bashrc
+++ b/.bashrc
@@ -87,15 +87,6 @@ fi
 # colored GCC warnings and errors
 #export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-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$//'\'')"'
-
 # Alias definitions.
 # You may want to put all your additions into a separate file like
 # ~/.bash_aliases, instead of adding them here directly.
@@ -120,11 +111,6 @@ export WLC_REPEAT_RATE=35
 export WLC_REPEAT_DELAY=210
 export ALTERNATE_EDITOR=""
 
-alias ecn="emacsclient -n"
-
-export EDITOR=ecn
-export VISUAL=ecn
-
 # I want to be able to toggle ibus languages easily
 function ibus_toggle {
     current=$(ibus engine)