diff options
Diffstat (limited to 'dot')
-rw-r--r-- | dot/xsession | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/dot/xsession b/dot/xsession index 077702a..c7905fc 100644 --- a/dot/xsession +++ b/dot/xsession | |||
@@ -16,7 +16,7 @@ xinput set-prop 'SynPS/2 Synaptics TouchPad' 'libinput Tapping Enabled' 1 | |||
16 | 16 | ||
17 | if [ -r ~/.Xresources.local ] | 17 | if [ -r ~/.Xresources.local ] |
18 | then | 18 | then |
19 | xrdb -merge ~/.Xresources.local | 19 | xrdb -merge ~/.Xresources.local |
20 | fi | 20 | fi |
21 | 21 | ||
22 | if [ "${DISPLAY%.*}" = :0 ] | 22 | if [ "${DISPLAY%.*}" = :0 ] |
@@ -24,8 +24,8 @@ then | |||
24 | /usr/lib/notification-daemon/notification-daemon & | 24 | /usr/lib/notification-daemon/notification-daemon & |
25 | xterm -e tmux attach & | 25 | xterm -e tmux attach & |
26 | quassel & | 26 | quassel & |
27 | firestartx & | ||
28 | fi | 27 | fi |
28 | |||
29 | for wm in xmonad i3 | 29 | for wm in xmonad i3 |
30 | do | 30 | do |
31 | command -v "$wm" >/dev/null || continue | 31 | command -v "$wm" >/dev/null || continue |
@@ -34,9 +34,26 @@ done | |||
34 | 34 | ||
35 | if [ -x ~/.xsession.local ] | 35 | if [ -x ~/.xsession.local ] |
36 | then | 36 | then |
37 | ~/.xsession.local | 37 | ~/.xsession.local |
38 | fi | ||
39 | |||
40 | if [ "${DISPLAY%.*}" = :0 ] | ||
41 | then | ||
42 | if [ "$XSESSION_DISPLAY0_FIRESTART_RAW" ] | ||
43 | then | ||
44 | if systemctl --user --quiet is-active firefox@$DISPLAY | ||
45 | then | ||
46 | systemctl --user stop firefox@$DISPLAY | ||
47 | fi | ||
48 | firestart & | ||
49 | else | ||
50 | firestartx & | ||
51 | fi | ||
52 | elif [ "$XSESSION_IS_FIRESTARTX" ] | ||
53 | then | ||
54 | firestart & | ||
38 | fi | 55 | fi |
39 | 56 | ||
40 | exec perl -e 'wait while 1' | 57 | exec perl -MPOSIX -e 'wait while pause' |
41 | xterm # if exec fails | 58 | xterm # if exec fails |
42 | 59 | ||