vim: do not set pastetoggle in nvim

[dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index 268260f94c00b063c72aca63d691020c21bfe8c8..7cb4e1989cb873fa7e904f738b87614fb32b8496 100644 (file)
--- 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
 userresources=$XDG_CONFIG_HOME/xinit/Xresources
 userresources_d=$XDG_CONFIG_HOME/xinit/Xresources.d
 usermodmap=$HOME/.Xmodmap

-userprofile=$XDG_CONFIG_HOME/xinit/xprofile
+userprofile=$HOME/.xprofile

 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
 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
 # redirect all further output

-exec 2>&1 >>"$logfile"
+exec 2>&1 >"$logfile"

 
 printf "\n%s  Reading '~/.xinitrc'\n" $(date --iso-8601=minutes)
 
 
 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
 
     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
 if [ -f "$usermodmap" ]; then
     xmodmap "$usermodmap"
 fi