Bash cleanup

diff --git a/.config/bash/environ b/.config/bash/environ
index bc16cfb9206b28c0f84b273a0d7f6050f5acc6f5..a0d5c89773340e63b0ac21116d868d743cb24b09 100644 (file)
--- a/.config/bash/environ
+++ b/.config/bash/environ
@@ -24,6 +24,7 @@ if [ "$color_prompt" = yes ]; then
 else
     PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 fi
+
 unset color_prompt force_color_prompt
 
 # If this is an xterm set the title to user@host:dir
@@ -35,20 +36,8 @@ xterm*|rxvt*)
     ;;
 esac
 
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    #alias grep='grep --color=auto'
-    #alias fgrep='fgrep --color=auto'
-    #alias egrep='egrep --color=auto'
-fi
-
 # colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 
 # Larger bash history
 export HISTFILESIZE=10000;
@@ -57,15 +46,7 @@ export HISTCONTROL=ignoreboth:erasedups
 export HISTIGNORE="ll:ls:cd:cd -:pwd:exit:date:* --help";
 
 # Whenever displaying the prompt, write the previous line to disk
-#export PROMPT_COMMAND="history -a"
-
-# Add keys for github and bitbucket
-#if [ ! -S $HOME/.ssh/ssh_auth_sock ]; then
-#  eval `ssh-agent`
-#  ln -sf "$SSH_AUTH_SOCK" $HOME/.ssh/ssh_auth_sock
-#fi
-#export SSH_AUTH_SOCK=$HOME/.ssh/ssh_auth_sock
-#ssh-add -l > /dev/null || ssh-add
+export PROMPT_COMMAND="history -a;"
 
 # Set defaults
 export SHELL='bash'
@@ -79,18 +60,6 @@ export BROWSER='lynx -vikeys -use_mouse'
 # Prefer US language with SI units (Danish)
 export LANG="en_DK.UTF-8"
 export LANGUAGE="en_US.UTF-8"
-#export LC_CTYPE="en_DK.UTF-8"
-#export LC_NUMERIC="en_DK.UTF-8"
-#export LC_TIME="en_DK.UTF-8"
-#export LC_COLLATE="en_DK.UTF-8"
-#export LC_MONETARY="en_DK.UTF-8"
-#export LC_MESSAGES="en_DK.UTF-8"
-#export LC_PAPER="en_DK.UTF-8"
-#export LC_NAME="en_DK.UTF-8"
-#export LC_ADDRESS="en_DK.UTF-8"
-#export LC_TELEPHONE="en_DK.UTF-8"
-#export LC_MEASUREMENT="en_DK.UTF-8"
-#export LC_IDENTIFICATION="en_DK.UTF-8"
 KEYMAP=us
 
 # Highlight section titles in manual pages
@@ -114,13 +83,14 @@ export RTEGENERATEVSCODE=1
 
 export VIRTUALENVWRAPPER_PYTHON=/mingw64/bin/python3
 
-#export XDG_CONFIG_HOME = $HOME/.config/
-#export XDG_DATA_HOME   = $HOME/.local/share/
-#export XDG_DATA_DIRS   = /usr/local/share/:/usr/share/
+# Set XDG directories
 if [ -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs ]; then
   . ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs
   export XDG_DESKTOP_DIR XDG_DOWNLOAD_DIR XDG_TEMPLATES_DIR XDG_PUBLICSHARE_DIR XDG_DOCUMENTS_DIR XDG_MUSIC_DIR XDG_PICTURES_DIR XDG_VIDEOS_DIR
 fi
+#export XDG_CONFIG_HOME = $HOME/.config/
+#export XDG_DATA_HOME   = $HOME/.local/share/
+#export XDG_DATA_DIRS   = /usr/local/share/:/usr/share/
 
 export USERNAME=$LOGNAME
 export HOSTNAME=`hostname`