3 files changed, 28 insertions, 29 deletions
diff --git a/configs/rcs/bashrc b/configs/rcs/bashrc
index 25a8971..cc376db 100755
--- a/configs/rcs/bashrc
+++ b/configs/rcs/bashrc
@@ -1,4 +1,4 @@
-export EDITOR="vim"
+export EDITOR="emacsclient"
 export HISTFILE=
 export LANG="en_US.UTF-8"
 export LC_ALL="$LANG"
@@ -14,9 +14,6 @@ export PS1="\h:\w % "
 
 RC_DIR=$(dirname $(readlink ${BASH_SOURCE[0]}))
 
-[[ -s "${RC_DIR}/rcs/aliases" ]] && source "${RC_DIR}/rcs/aliases"
-[[ -s "${RC_DIR}/rcs/twitter" ]] && source "${RC_DIR}/rcs/twitter"
-
 # finally, build the path and source a few files
 __add_to_path_if_exists() {
   [ -d "$1" ] && export PATH="$1:$PATH"
@@ -37,3 +34,30 @@ __add_to_path_if_exists "${HOME}/workspace/git.twitter.biz/source/dist"
 __add_to_path_if_exists "/opt/twitter/opt/go/libexec/bin"
 __add_to_path_if_exists "/opt/twitter/bin"
 __source_file_if_exists "/opt/twitter/rvm/scripts/rvm"
+
+alias cp="cp -i"
+alias l="ls"
+alias la="ls -a"
+alias ll="ls -lh"
+alias lt="ls -lhtr"
+alias mv="mv -i"
+alias rm="rm -i"
+
+alias g="git"
+alias s="cd ~/workspace/git.twitter.biz/source"
+
+alias upload-transactions='smpl-transactions --project fcuny-finance --dataset finance'
+
+alias gohomedevbox="ssh -A 192.168.86.157"
+alias gobastion="gcloud compute ssh bastion"
+
+alias gosmfipmi="ssh -A ipmibastion1.smf1.twitter.com"
+alias goatlipmi="ssh -A ipmibastion1.atla.twitter.com"
+alias gosmfnest="ssh -A nest.smfc.twitter.com"
+alias goatlnest="ssh -A nest.smfc.twitter.com"
+
+alias gotwdevbox="ssh -A 172.25.31.131"
+alias gomesosbuild="ssh -A smf1-egu-15-sr1.prod.twitter.com"
+
+alias smf1pending='curl -s https://aurora-smf1.twitter.biz/pendingtasks | jq .'
+alias atlapending='curl -s https://aurora-atla.twitter.biz/pendingtasks | jq .'
diff --git a/configs/rcs/rcs/aliases b/configs/rcs/rcs/aliases
deleted file mode 100644
index 6844528..0000000
--- a/configs/rcs/rcs/aliases
+++ /dev/null
@@ -1,15 +0,0 @@
-alias cp="cp -i"
-alias l="ls"
-alias la="ls -a"
-alias ll="ls -lh"
-alias lt="ls -lhtr"
-alias mv="mv -i"
-alias rm="rm -i"
-
-alias g="git"
-alias s="cd ~/workspace/git.twitter.biz/source"
-
-alias upload-transactions='smpl-transactions --project fcuny-finance --dataset finance'
-
-alias gohomedevbox="ssh -A 192.168.86.157"
-alias gobastion="gcloud compute ssh bastion"
diff --git a/configs/rcs/rcs/twitter b/configs/rcs/rcs/twitter
deleted file mode 100644
index 982c981..0000000
--- a/configs/rcs/rcs/twitter
+++ /dev/null
@@ -1,10 +0,0 @@
-alias gosmfipmi="ssh -A ipmibastion1.smf1.twitter.com"
-alias goatlipmi="ssh -A ipmibastion1.atla.twitter.com"
-alias gosmfnest="ssh -A nest.smfc.twitter.com"
-alias goatlnest="ssh -A nest.smfc.twitter.com"
-
-alias gotwdevbox="ssh -A 172.25.31.131"
-alias gomesosbuild="ssh -A smf1-egu-15-sr1.prod.twitter.com"
-
-alias smf1pending='curl -s https://aurora-smf1.twitter.biz/pendingtasks | jq .'
-alias atlapending='curl -s https://aurora-atla.twitter.biz/pendingtasks | jq .'