X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/b1e8e5ac6467e8b0b8865b3a3387d2ea614b0672..b47ffe60e244c9165f40371736079320ea2d848b:/xinitrc

diff --git a/xinitrc b/xinitrc
index 9f4e466..7cb4e19 100644
--- a/xinitrc
+++ b/xinitrc
@@ -4,7 +4,7 @@ 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
 
@@ -34,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
@@ -46,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