# HG changeset patch # User Meredith Howard # Date 1499319049 14400 # Node ID 595c6f803258a00f573eee805025fd0e1f19183e # Parent 6c094ff1cb8706063077240ed96865b76ebfda34 simplify diff --git a/.xsessionrc b/.xsessionrc --- a/.xsessionrc +++ b/.xsessionrc @@ -7,11 +7,14 @@ if [ "$PLATFORM" = "OpenBSD" ]; then PATH="/usr/X11R6/bin:$PATH" fi -hsetroot -solid "#002244" >/dev/null 2>&1 || \ +make -s -C ~/.i3 || { + cat ~/.i3/config.d/* > ~/.i3/config + cat ~/.i3/status.d/* > ~/.i3/status +} + +hsetroot -solid "#002244" || xsetroot -def -solid "#002244" -xcompmgr -n >/dev/null 2>&1 ~/.i3/config - cat ~/.i3/status.d/* > ~/.i3/status -} +urxvtd -o & if [ -r ~/.xsessionrc.local ]; then . ~/.xsessionrc.local @@ -37,7 +37,9 @@ if [ "$VIRT" = "yes" ]; then else xset b off s 300 dpms 360 xautolock -detectsleep & - pulseaudio --daemonize - nm-applet >/dev/null 2>&1 &2 +