From 22c075fdced08dba133e76ce1ef47da350f7687c Mon Sep 17 00:00:00 2001
From: Eric Phillips <ewpt3ch@gmail.com>
Date: Mon, 15 Jun 2015 18:12:10 -0600
Subject: [PATCH] merged master bashrc

---
 bashrc | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/bashrc b/bashrc
index ac3d846..f7e84bf 100644
--- a/bashrc
+++ b/bashrc
@@ -1,14 +1,12 @@
-# /etc/skel/.bashrc
-#
-# This file is sourced by all *interactive* bash shells on startup,
-# including some apparently interactive shells such as scp and rcp
-# that can't tolerate any output.  So make sure this doesn't display
-# anything or bad things will happen !
+#!/bin/bash
 
+### ~/.bashrc #######################
+#####################################
+## eric at ewpt3ch.com ##############
+## dotfiles on github.com ewpt3ch ###
+#####################################
 
-# Test for an interactive shell.  There is no need to set anything
-# past this point for scp and rcp, and it's important to refrain from
-# outputting anything in those cases.
+### test for interactive shell
 if [[ $- != *i* ]] ; then
 	# Shell is non-interactive.  Be done now!
 	return
@@ -19,9 +17,10 @@ fi
 source ~/todo.txt-cli/todo_completion
 source ~/bin/npm_completion
 #pacman aliases
-alias pacupg='sudo pacman -Syu'
-alias pacins='sudo pacman -U'
-alias emacs='emacs -nw'
+alias pacman='sudo pacman'
+alias pacupg='pacman -Syu'
+alias pacins='pacman -U'
+#
 alias t='clear && $HOME/Dropbox/todo/todo.sh -d $HOME/Dropbox/todo/todo.cfg'
 alias nano='nano -w'
 alias ls='ls --color=auto'
@@ -29,7 +28,7 @@ alias grep='grep --color=auto'
 alias fgrep='fgrep --color=auto'
 alias egrep='egrep --color=auto'
 complete -F _todo t
-PATH="/home/ewpt3ch/bin:${PATH}:./:"
+PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:${PATH}:./:"
 export VMWARE_USE_SHIPPED_GTK="yes"
 export EDITOR=vim
 export PAGER=less
@@ -38,7 +37,6 @@ export BROWSER=firefox-developer
 #create cache-dir for chrome
 mkdir -p /tmp/ewpt3ch-cache
 eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ed25519) 
-#eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ecdsa ~/.ssh/id_rsa)
 #Check if dropbox is running
 if  dropbox.py running  ; then
   #start dropbox