X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/32f70454b96a7823c2bc681df5d6cfd405c9163a..fd2e16fc92dd7a33908ceff1e31f03e05a78fda9:/xinitrc

diff --git a/xinitrc b/xinitrc
index b7597ec..7cb4e19 100644
--- a/xinitrc
+++ b/xinitrc
@@ -4,12 +4,16 @@ logfile=$XDG_DATA_HOME/xorg/xinit.log
 userresources=$XDG_CONFIG_HOME/xinit/Xresources
 userresources_d=$XDG_CONFIG_HOME/xinit/Xresources.d
 usermodmap=$HOME/.Xmodmap
-userprofile_d=$XDG_CONFIG_HOME/xinit/xprofile.d
+userprofile=$HOME/.xprofile
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
+# backup logfile
+if [ -f "$logfile" ]; then
+    mv -f "$logfile" ${logfile}.old
+fi
 # redirect all further output
-exec 2>&1 >>"$logfile"
+exec 2>&1 >"$logfile"
 
 printf "\n%s  Reading '~/.xinitrc'\n" $(date --iso-8601=minutes)
 
@@ -30,6 +34,10 @@ if [ -f $userresources_d/$(hostname) ]; then
     xrdb -merge $userresources_d/$(hostname)
 fi
 
+if [ -f $userresources_d/colors_$THEME ]; then
+    xrdb -merge $userresources_d/colors_$THEME
+fi
+
 if [ -f "$usermodmap" ]; then
     xmodmap "$usermodmap"
 fi
@@ -42,13 +50,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
     unset f
 fi
 
-if [ -d "$userprofile_d" ] ; then
-    for f in $userprofile_d/?*.sh ; do
-        [ -f "$f" ] && source "$f"
-    done
-    unset f
-fi
-
 if [ -f "$userprofile" ]; then
     source "$userprofile"
 fi