[bash] some clean up / new aliases

3 files changed, 28 insertions, 20 deletions

diff --git a/bashrc b/bashrc
index 025b6f1..0d2e21d 100755
--- a/bashrc
+++ b/bashrc
@@ -1,4 +1,4 @@
-export EDITOR="emacsclient -nw"
+export EDITOR="emacsclient"
 export HISTFILE=
 export LANG="en_US.UTF-8"
 export LC_ALL="$LANG"
@@ -12,25 +12,10 @@ export GOPATH="${HOME}/gocode"
 # prompts
 export PS1="\h:\w % "
 
-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 upload-transactions='smpl-transactions --project fcuny-finance --dataset finance'
-
-# Twitter aliases
-alias gobastion="gcloud compute ssh bastion"
-alias gocsnest="ssh -A csnest2.smf1.twitter.com"
-alias goebnest="ssh -A eventbus@nest.smfc.twitter.com"
-alias goipmi="ssh -A ipmibastion1.atla.twitter.com"
-alias gonest="ssh -A nest.smfc.twitter.com"
-alias gotwdevbox="ssh -A 172.25.31.131"
-alias gohomedevbox="ssh -A 192.168.86.157"
-alias gomesosbuild="ssh -A smf1-egu-15-sr1.prod.twitter.com"
+RC_DIR=$(dirname $(readlink ${BASH_SOURCE[0]}))
+
+[[ -s "${RC_DIR}/rcs/aliases" ]] && source "${RC_DIR}/rcs/aliases"
+[[ -s "${RC_DIR}/rcs/twitter.sh" ]] && source "${RC_DIR}/rcs/twitter"
 
 # finally, build the path and source a few files
 __add_to_path_if_exists() {
diff --git a/rcs/aliases b/rcs/aliases
new file mode 100644
index 0000000..0417c3e
--- /dev/null
+++ b/rcs/aliases
@@ -0,0 +1,13 @@
+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 upload-transactions='smpl-transactions --project fcuny-finance --dataset finance'
+
+# Twitter aliases
+alias gohomedevbox="ssh -A 192.168.86.157"
+alias gobastion="gcloud compute ssh bastion"
diff --git a/rcs/twitter b/rcs/twitter
new file mode 100644
index 0000000..127c1ce
--- /dev/null
+++ b/rcs/twitter
@@ -0,0 +1,10 @@
+alias gosmfipmi="ssh -A ipmibastion1.atla.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 .'