summaryrefslogtreecommitdiff
path: root/x11/xinitrc
diff options
context:
space:
mode:
authorTimmy Keller <tjk@tjkeller.xyz>2023-10-03 09:47:15 -0500
committerTimmy Keller <tjk@tjkeller.xyz>2023-10-03 09:47:15 -0500
commit1e47ea39d445e2bd0b1475355f30c36f320d268f (patch)
tree8341bdb4b2dec4ff0c2e5845466a95b46abac672 /x11/xinitrc
parentdb69128e0a0dafc1e67f7035d8d9da805cd65d75 (diff)
parentb8afc0ee37255aa00c68ab70220d2c957c205e64 (diff)
downloaddotconfig-1e47ea39d445e2bd0b1475355f30c36f320d268f.tar.xz
dotconfig-1e47ea39d445e2bd0b1475355f30c36f320d268f.zip
Merge branch 'master' of localgit:dotconfig
Diffstat (limited to 'x11/xinitrc')
-rwxr-xr-xx11/xinitrc6
1 files changed, 4 insertions, 2 deletions
diff --git a/x11/xinitrc b/x11/xinitrc
index 525cb0c..261a42b 100755
--- a/x11/xinitrc
+++ b/x11/xinitrc
@@ -1,5 +1,7 @@
#!/bin/sh
X11CONFIG=${X11CONFIG:=${XDG_CONFIG_HOME:+$XDG_CONFIG_HOME/x11}}; X11CONFIG=${X11CONFIG:-$HOME/.config/x11}
-X11CONFIG=$X11CONFIG $X11CONFIG/xprofile
-[ -e $X11CONFIG/xprofile.$(hostname) ] && X11CONFIG=$X11CONFIG $X11CONFIG/xprofile.$(hostname)
+if [ ! "$SKIPCONFIG" ]; then
+ X11CONFIG=$X11CONFIG $X11CONFIG/xprofile
+ [ -e $X11CONFIG/xprofile.$(hostname) ] && X11CONFIG=$X11CONFIG $X11CONFIG/xprofile.$(hostname)
+fi
exec dbus-launch --exit-with-session ${WM:-timmywm}