merged bashrc changes from yoga2 branch

This commit is contained in:
2015-05-18 16:39:34 -06:00
parent 4e8fe75b30
commit a5b0dd7e75
+9 -7
View File
@@ -17,8 +17,11 @@ fi
# Put your fun stuff here. # Put your fun stuff here.
#source /etc/profile.d/bash-completion.sh #source /etc/profile.d/bash-completion.sh
source ~/todo.txt-cli/todo_completion source ~/todo.txt-cli/todo_completion
#pacman aliases
alias pacupg='sudo pacman -Syu'
alias pacins='sudo pacman -U'
alias emacs='emacs -nw' alias emacs='emacs -nw'
alias t='$HOME/Dropbox/todo/todo.sh -d $HOME/Dropbox/todo/todo.cfg' alias t='clear && $HOME/Dropbox/todo/todo.sh -d $HOME/Dropbox/todo/todo.cfg'
alias nano='nano -w' alias nano='nano -w'
alias ls='ls --color=auto' alias ls='ls --color=auto'
alias grep='grep --color=auto' alias grep='grep --color=auto'
@@ -29,18 +32,17 @@ PATH="/home/ewpt3ch/bin:${PATH}:./:"
export VMWARE_USE_SHIPPED_GTK="yes" export VMWARE_USE_SHIPPED_GTK="yes"
export EDITOR=vim export EDITOR=vim
export PAGER=less export PAGER=less
export LIBVA_DRIVER_NAME=vdpau
#create cache-dir for chrome #create cache-dir for chrome
mkdir -p /tmp/ewpt3ch-cache mkdir -p /tmp/ewpt3ch-cache
keychain -q ~/.ssh/id_ecdsa ~/.ssh/id_rsa eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ecdsa ~/.ssh/id_rsa)
. ~/.keychain/$HOSTNAME-sh
. ~/.keychain/$HOSTNAME-sh-gpg
#Check if dropbox is running #Check if dropbox is running
if dropbox.py running ; then if dropbox.py running ; then
#start dropbox #start dropbox
~/bin/dropbox.py start ~/bin/dropbox.py start
fi fi
#check if btsync running and start #check if btsync running and start
if ! ps -A | grep -q btsync ; then #if ! ps -A | grep -q btsync ; then
#start btsync #start btsync
btsync --config ~/.config/btsync/btsync.conf # btsync --config ~/.config/btsync/btsync.conf
fi #fi