From c5fc57c199501c2cb4220a3dee068e215539802d Mon Sep 17 00:00:00 2001
From: David Phillips <david@sighup.nz>
Date: Thu, 20 Apr 2017 16:17:59 +1200
Subject: Make bashrc use same aliases and env as zshrc

---
 bashrc | 53 ++---------------------------------------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

diff --git a/bashrc b/bashrc
index 0299796..b76cb67 100644
--- a/bashrc
+++ b/bashrc
@@ -58,66 +58,17 @@ if [ "$TERM" == "st-256color" ]; then
 	echo $(tput smkx) > /dev/tty
 fi
 
-man() {
-        env LESS_TERMCAP_mb=$'\E[01;31m' \
-        LESS_TERMCAP_md=$'\E[01;38;5;74m' \
-        LESS_TERMCAP_me=$'\E[0m' \
-        LESS_TERMCAP_se=$'\E[0m' \
-        LESS_TERMCAP_so=$'\E[38;5;246m' \
-        LESS_TERMCAP_ue=$'\E[0m' \
-        LESS_TERMCAP_us=$'\E[04;38;5;146m' \
-        man "$@"
-}
-
-ccc () {
-	bc -l <<< "$@"
-}
-
 ###############
 PS1="${BYellow}\
 ┌[${BGreen}\u${BYellow}@${BBlue}\h${BYellow}][${BPurple}\W${BYellow}"'$(__git_ps1 " (%s)")'"] ${BBlack}<\d \t>${BYellow}\n\
 └╼ \[${Colour_Off}\]"
 ###############
-export GPG_TTY=$(tty)
-export EDITOR=/usr/bin/vim
-
-if [ $(which clang 2>/dev/null) ]; then
-	export CC=clang
-	export CXX=clang
-elif [[ $(which tcc 2>/dev/null) && !$(which gcc 2>/dev/null) ]]; then
-	export CC=tcc
-fi
 
-alias sudo="sudo "
-alias monut=mount
-alias pamcan=pacman
-#alias scron="sudo EDITOR=nano crontab -e"
-alias ls="/bin/ls --color=auto"
-alias fimp="gimp"
-alias sl=ls
-alias grep="grep --color=auto"
-alias egrep="egrep --color=auto"
-alias xpdf="xpdf -cont"
-alias feh="feh --magick-timeout=0"
-alias xcp="xclip -selection c"
-alias pd=popd
-alias po='pushd $OLDPWD'
-
-cd() {
-	if [ $# -eq 0 ] ; then
-		d=$HOME
-	else
-		d=$@
-	fi
-	pushd "$d" >/dev/null
-}
-
-# u=rwx,g=,o=
-umask 077
+source ~/.aliases
+source ~/.environment
 
 echo Running $(uname) $(uname -r) on $(uname -n) \($(uname -m)\)
 
-
 if [ -f ~/todo ]; then
 	echo To do:
 	cat ~/todo
-- 
cgit v1.1