This seems to be the most portable option for .bash{rc,_profle}

3 files changed, 42 insertions, 38 deletions

diff --git a/.bash_logout b/.bash_logout
index efa6e54..5b4f8bb 100644
--- a/.bash_logout
+++ b/.bash_logout
@@ -1,2 +1 @@
 clear
-
diff --git a/.bash_profile b/.bash_profile
index 3a02b32..ea05214 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,35 +1 @@
-export EDITOR=zile
-export HISTFILE=$HOME/.histfile
-export HISTSIZE=8192
-export LANGUAGE="en_GB.UTF-8"
-export PATH=$HOME/.local/bin:$HOME/prog/go/bin:$HOME/.cargo/bin:$PATH
-export SUDO_EDITOR=zile
-export VISUAL=emacs
-export ESHELL=bash
-
-export GOPATH=$HOME/prog/go
-export TEXMFHOME=$HOME/.local/share/texlive
-
-export BROWSER=firefox
-export XDG_DESKTOP_DIR=$HOME
-export XDG_DOCUMENTS_DIR=$HOME/store
-export XDG_DOWNLOAD_DIR=$HOME/store/downloads
-export XDG_MUSIC_DIR=$HOME/store/music
-export XDG_PICTURES_DIR=$HOME/picutures
-export XDG_PUBLICSHARE_DIR=$HOME/public
-export XDG_TEMPLATES_DIR=$HOME/store/templates
-export XDG_VIDEOS_DIR=$HOME/store/videos
-
-export LESS="-S -R"
-export LESSCHARSET=utf-8
-export LESSHISTFILE="-"
-
-# ?
-# export CATHISTFILE="-"
-
-LS_COLORS='rs=0:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:tw=30;42:ow=34;42:st=37;44:ex=01;32:';
-export LS_COLORS
-
-umask 077
-
-eval $(keychain --eval --systemd -q)
+source ~/.bashrc
\ No newline at end of file
diff --git a/.bashrc b/.bashrc
index 8ae85de..436af24 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,4 +1,40 @@
-source ~/.bash_profile
+export HISTFILE=$HOME/.histfile
+export HISTSIZE=8192
+export HISTFILESIZE=-1
+export HISTCONTROL=ignoreboth
+shopt -s histappend
+
+export LANGUAGE="en_GB.UTF-8"
+export PATH=$HOME/.local/bin:$HOME/prog/go/bin:$HOME/.cargo/bin:$PATH
+
+export EDITOR=zile
+export SUDO_EDITOR=zile
+export VISUAL=emacs
+export ESHELL=bash
+
+export GOPATH=$HOME/prog/go
+export TEXMFHOME=$HOME/.local/share/texlive
+
+export BROWSER=iceweasel
+export XDG_DESKTOP_DIR=$HOME
+export XDG_DOCUMENTS_DIR=$HOME/store
+export XDG_DOWNLOAD_DIR=$HOME/store/downloads
+export XDG_MUSIC_DIR=$HOME/store/music
+export XDG_PICTURES_DIR=$HOME/picutures
+export XDG_PUBLICSHARE_DIR=$HOME/public
+export XDG_TEMPLATES_DIR=$HOME/store/templates
+export XDG_VIDEOS_DIR=$HOME/store/videos
+
+export LESS="-S -R"
+export LESSCHARSET=utf-8
+export LESSHISTFILE="-"
+
+# ?
+# export CATHISTFILE="-"
+
+LS_COLORS='rs=0:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:tw=30;42:ow=34;42:st=37;44:ex=01;32:';
+export LS_COLORS
+
 
 leftprompt() {
     e=$?; (( $e )) && r="\[$(tput setaf 1)\]<$e>\[$(tput sgr0)\]" || r="";
@@ -28,6 +64,7 @@ alias rm='rm -i'
 alias ls='ls --group-directories-first -vhF --color=always'
 alias hh='cd $HOME'
 alias bk='cd $OLDPWD'
+alias t=tmux
 alias t="date +%H\ %M\ %S | dc -e '6k???86400/r1440/+r24/+p'"
 
 alias ..='cd ..'
@@ -39,7 +76,7 @@ alias ......='cd ../../../../..'
 alias lower="tr '[:upper:]' '[:lower:]'"
 alias upper="tr '[:lower:]' '[:upper:]'"
 alias rot13="tr abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM"
-alias weather="wget --quiet -O - wttr.in/Berkeley?m"
+alias weather="wget -O - wttr.in/Baltimore?m | less"
 
 mvf() { mv $*; cd $_ ;}
 c() { echo 'scale=13;' $* | bc -l; }
@@ -53,3 +90,5 @@ umask 077
 set -o emacs
 shopt -s autocd
 shopt -s checkwinsize
+
+eval $(keychain --eval --systemd -q)