Remove XDG_ variables

We should not set them on our own

2 files changed, 9 insertions, 57 deletions

diff --git a/.config/bash/environment.sh b/.config/bash/environment.sh
index fad4653..c3b4eba 100644
--- a/.config/bash/environment.sh
+++ b/.config/bash/environment.sh
@@ -19,7 +19,7 @@ if [ `type -P vimpager 2>&-` ]; then
 fi
 
 # dont like the automatic pager spawning for ctl aps
-export SYSTEMD_PAGER=cat
+export SYSTEMD_PAGER=
 
 if [[ ${EUID} == 0 ]]; then
 	DELIM_COL='\[\e[0;31m\]'
@@ -37,70 +37,25 @@ PS1="${DELIM_COL}[${DIR_COL}\W${DELIM_COL}] \\\$ ${NOR_COL}"
 
 unset BRACKET_COL DIR_COL PROMPT_COL NOR_COL UNAME_COL
 
-#if [[ ${EUID} == 0 ]] ; then
-#  PS1='\[\e[0;31m\][\[\e[0;34m\]\W\[\e[0;31m\]] \$\[\e[0m\] '
-#  [[ -n $SSH_CLIENT ]] && PS1="\[\e[0;31m\]\h\[\e[0m\] $PS1"
-#else
-#  PS1='\[\e[0;34m\][\[\e[0;32m\]\W\[\e[0;34m\]] \$\[\e[0m\] '
-#  [[ -n $SSH_CLIENT ]] && PS1="\[\e[1;32m\]\u@\h\[\e[0m\] $PS1"
-
-#fi
-
-##PS1="\$(test \$(~/coding/c/get_cursor_pos) -gt 1 && echo '\[\n\]')${PS1}"
-
-##PS1="\$([[ \$(get_cursor_y) -gt 1 ]] && echo -n '\[\n\]')$PS1"
-##PS1="\$(prompt_nl_needed && echo '\[\n\]')${PS1}"
-
-#PS1="\$(print_prompt_nl_if_needed)${PS1}"
-
-#PS1="\$(~/coding/c/nl_if_needed)$PS1"
-
-#inspired by http://www.xfce-look.org/content/show.php/My+Destkop+(December)?content=50362
-#PS1="\[\e[\$((COLUMNS-\$(echo -n '\W' | wc -c)-2))G\] [\W]\[\e[0G\]\$ "
-CMD="\$(date +%H:%M)"
-
-#PS1="\[\e[\$((COLUMNS-\$(echo -n $CMD | wc -c)-2))G\] \[\e[0;34m\][\[\e[0;32m\]$CMD\[\e[0;34m\]]\[\e[0G\]${PS1}" 
-#PS1="$PS1\[\e[s\[\e[\$((COLUMNS-\$(echo -n $CMD | wc -c)-2))G\]abc\[\e[u\]"
-
-#if [[ ${EUID} != 0 ]] ; then
-  #PS1='\[\033[1;34m\]\W \$\[\033[00m\] '
-  #PS1='[\[\e[0;31m\]\W\[\e[0m\]] \$ '
-  #PS1='\[\033[01;32m\]\u\[\033[00m\]@\[\033[01;31m\]\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ '
-  #PS1='\[\e[1;31m\][\[\e[1;32m\]\W\[\e[1;31m\]]\[\e[1;34m\] \$\[\e[0m\] '
-  #PS1='\[\e[0;34m\][\[\e[0;32m\]\W\[\e[0;34m\]] \$\[\e[0m\] '
-  #PS1='\[\033[01;32m\]\u\[\033[00m\]@\[\033[01;31m\]\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ '
-  #PS1='[\[\e[36;40m\]\u\[\e[0m\]] \[\e[32;40m\]\W \[\e[0m\]\$ '
-  #PS1='[\u \w]\$ '
-  #PS1="\[\033[0;36m\]\t\[\033[1;35m\]^\
-    #\[\033[0;32m\]\u\[\033[1;34m\]@\[\033[0;32m\]\
-    #\h\[\033[1;35m\]:\[\033[1;33m\]\w\[\033[0m\]\
-    #\[\033[1;34m\]$\[\033[0m\] "
-#fi
 
 # configure audio
 export SDL_AUDIODRIVER=pulse
-#export SDL_AUDIODRIVER=alsa
-#export AUDIODEV=plug:upmix
 
-# set XDG corresponding variables
-export XDG_DATA_HOME="${HOME}/.local/share"
-export XDG_CONFIG_HOME="${HOME}/.config"
-export XDG_CACHE_HOME="${HOME}/.cache"
 
 # openal config in ~/.config/openal/alsoft.conf  instead of ~/.alsoftrc
-export ALSOFT_CONF="${XDG_CONFIG_HOME}/openal/alsoft.conf"
+export ALSOFT_CONF="${HOME}/.config/openal/alsoft.conf"
 
 # readline should read its user config from this path instead ~/.inputrc
-export INPUTRC="${XDG_CONFIG_HOME}/readline/inputrc"
+export INPUTRC="${HOME}/.config/readline/inputrc"
 
 # manually set vim's vimrc variable and then source that file on vim startup
-export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
+export VIMINIT='let $MYVIMRC="$HOME/.config/vim/vimrc" | source $MYVIMRC'
 
-#export GTK2_RC_FILES="${XDG_CONFIG_HOME}/gtk-2.0/gtkrc"
+#export GTK2_RC_FILES="${HOME}/.config/gtk-2.0/gtkrc"
 
-export EIXRC="${XDG_CONFIG_HOME}/eixrc/eixrc"
+export EIXRC="${HOME}/.config/eixrc/eixrc"
 
-export DVDCSS_CACHE="${XDG_CACHE_HOME}/dvdcss/"
+export DVDCSS_CACHE="${HOME}/.cache/dvdcss/"
 
 # Needed for libquvi 0.9 (0.4 automatically searches here)
 export LIBQUVI_SCRIPTS_DIR="${HOME}/.local/share/libquvi-scripts/"
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index 47e1781..7498636 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -6,7 +6,7 @@
 "end
 
 set dir=/home/ben/.cache/vim/swp/
-set runtimepath=$XDG_CONFIG_HOME/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
+set runtimepath=$HOME/.config/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
 runtime bundle/vim-pathogen/autoload/pathogen.vim
 
 " basics
@@ -139,7 +139,7 @@ autocmd FileType man set nonumber nohlsearch nohlsearch
 autocmd FileType tex colorscheme delek
 "autocmd FileType asciidoc colorscheme inkpot
 
-set spellfile=$XDG_CONFIG_HOME/vim/spell/spell.de.add,$XDG_CONFIG_HOME/vim/spell/spell.en.add
+set spellfile=$HOME/.config/vim/spell/spell.de.add,$HOME/vim/spell/spell.en.add
 
 
 highlight ExtraWhitespace ctermbg=red guibg=red
@@ -169,7 +169,4 @@ set t_vb=
 "
 " its important that viminfo is set at the end
 " some options seem to overwrite this (history..)
-"set viminfo+=n$XDG_CACHE_HOME/vim/viminfo
-"set dir=$XDG_CACHE_HOME/vim/swp/
-"set runtimepath=$XDG_DATA_HOME/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
 set viminfo+=n/home/ben/.cache/vim/viminfo