From 5e5e5029e76d88b3887bb175e28709a9022323a8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 27 Feb 2016 18:31:31 -0500 Subject: X11 systemd stuff --- .config/systemd/user/X11@.target | 2 ++ .config/systemd/user/X11@.target.requires/wmii@.service | 1 + .config/systemd/user/dunst@.service | 7 ++++--- .config/systemd/user/emacs-daemon.service | 1 + .config/systemd/user/lxpanel@.service | 8 +++++--- .config/systemd/user/panel@.target | 4 +++- .config/systemd/user/redshift@.service | 7 ++++--- .config/systemd/user/synergy@.service | 8 +++++--- .config/systemd/user/wm-running@.target | 2 ++ .config/systemd/user/wm-running@.target.requires/wmii@.service | 1 + .config/systemd/user/wm@.target | 2 -- .config/systemd/user/wm@.target.requires/wmii@.service | 1 - .config/systemd/user/wmii@.service | 10 ++++++---- .config/systemd/user/x0vncserver@.service | 5 +++-- .config/systemd/user/xcompmgr@.service | 6 ++++-- 15 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 .config/systemd/user/X11@.target create mode 120000 .config/systemd/user/X11@.target.requires/wmii@.service create mode 100644 .config/systemd/user/wm-running@.target create mode 120000 .config/systemd/user/wm-running@.target.requires/wmii@.service delete mode 100644 .config/systemd/user/wm@.target delete mode 120000 .config/systemd/user/wm@.target.requires/wmii@.service (limited to '.config/systemd') diff --git a/.config/systemd/user/X11@.target b/.config/systemd/user/X11@.target new file mode 100644 index 0000000..d84f814 --- /dev/null +++ b/.config/systemd/user/X11@.target @@ -0,0 +1,2 @@ +[Unit] +Description=Connection to X11 display %I diff --git a/.config/systemd/user/X11@.target.requires/wmii@.service b/.config/systemd/user/X11@.target.requires/wmii@.service new file mode 120000 index 0000000..1b202d2 --- /dev/null +++ b/.config/systemd/user/X11@.target.requires/wmii@.service @@ -0,0 +1 @@ +../wmii@.service \ No newline at end of file diff --git a/.config/systemd/user/dunst@.service b/.config/systemd/user/dunst@.service index 568af3f..265845b 100644 --- a/.config/systemd/user/dunst@.service +++ b/.config/systemd/user/dunst@.service @@ -1,10 +1,11 @@ [Unit] Description=Dunst notification-daemon on X display %I Documentation=man:dunst(1) -StopWhenUnneeded=true +After=X11@%i.target +Requisite=X11@%i.target [Service] -Type=simple Environment=DISPLAY=%I + +Type=simple ExecStart=/usr/bin/dunst -Restart=always diff --git a/.config/systemd/user/emacs-daemon.service b/.config/systemd/user/emacs-daemon.service index 4077e97..eaf6729 100644 --- a/.config/systemd/user/emacs-daemon.service +++ b/.config/systemd/user/emacs-daemon.service @@ -5,6 +5,7 @@ Description=Emacs deamon Type=forking ExecStart=/bin/bash -l -c 'emacs --daemon' ExecStop=/bin/bash -l -c 'emacsclient -a false -e "(kill-emacs)"' +Restart=always [Install] WantedBy=default.target diff --git a/.config/systemd/user/lxpanel@.service b/.config/systemd/user/lxpanel@.service index ecded87..3a0dc67 100644 --- a/.config/systemd/user/lxpanel@.service +++ b/.config/systemd/user/lxpanel@.service @@ -2,14 +2,16 @@ Description=LXDE Desktop Panel on X display %I Documentation=man:lxpanel(1) StopWhenUnneeded=true -After=wm@%i.target +After=X11@%i.target wm-running@%i.target +Requisite=X11@%i.target +Requires=wm-running@%i.target Before=panel@%i.target [Service] -Type=simple Environment=DISPLAY=%I + +Type=simple ExecStart=/usr/bin/lxpanel -Restart=always [Install] RequiredBy=panel@%i.target diff --git a/.config/systemd/user/panel@.target b/.config/systemd/user/panel@.target index ed3dffd..53d45b0 100644 --- a/.config/systemd/user/panel@.target +++ b/.config/systemd/user/panel@.target @@ -1,3 +1,5 @@ [Unit] -Description=Desktop Panel (System Tray) on display %I +Description=Desktop Panel (System Tray) on X display %I StopWhenUnneeded=true +After=X11@%i.target +Requisite=X11@%i.target diff --git a/.config/systemd/user/redshift@.service b/.config/systemd/user/redshift@.service index b4ef3bb..dff6e7b 100644 --- a/.config/systemd/user/redshift@.service +++ b/.config/systemd/user/redshift@.service @@ -1,11 +1,12 @@ [Unit] Description=Redshift display colour temperature adjustment on X display %I Documentation=http://jonls.dk/redshift/ -StopWhenUnneeded=true +After=X11@%i.target +Requisite=X11@%i.target [Service] -Type=simple Environment=DISPLAY=%I + +Type=simple ExecStart=/usr/bin/redshift ExecStopPost=/usr/bin/redshift -x -Restart=always diff --git a/.config/systemd/user/synergy@.service b/.config/systemd/user/synergy@.service index df0640a..dc15e58 100644 --- a/.config/systemd/user/synergy@.service +++ b/.config/systemd/user/synergy@.service @@ -1,10 +1,12 @@ [Unit] Description=Keyboard and mouse sharing on X display %I -StopWhenUnneeded=true +#StopWhenUnneeded=true +After=X11@%i.target panel@%i.target +Requisite=X11@%i.target Requires=panel@%i.target [Service] -Type=simple Environment=DISPLAY=%I + +Type=simple ExecStart=/usr/bin/synergy -Restart=always diff --git a/.config/systemd/user/wm-running@.target b/.config/systemd/user/wm-running@.target new file mode 100644 index 0000000..8d3a38b --- /dev/null +++ b/.config/systemd/user/wm-running@.target @@ -0,0 +1,2 @@ +[Unit] +Description=Window Manager is running on X display %I diff --git a/.config/systemd/user/wm-running@.target.requires/wmii@.service b/.config/systemd/user/wm-running@.target.requires/wmii@.service new file mode 120000 index 0000000..1b202d2 --- /dev/null +++ b/.config/systemd/user/wm-running@.target.requires/wmii@.service @@ -0,0 +1 @@ +../wmii@.service \ No newline at end of file diff --git a/.config/systemd/user/wm@.target b/.config/systemd/user/wm@.target deleted file mode 100644 index c114bf5..0000000 --- a/.config/systemd/user/wm@.target +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Description=Window Manager on display %I diff --git a/.config/systemd/user/wm@.target.requires/wmii@.service b/.config/systemd/user/wm@.target.requires/wmii@.service deleted file mode 120000 index 1b202d2..0000000 --- a/.config/systemd/user/wm@.target.requires/wmii@.service +++ /dev/null @@ -1 +0,0 @@ -../wmii@.service \ No newline at end of file diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service index 4a81e3f..f1e87df 100644 --- a/.config/systemd/user/wmii@.service +++ b/.config/systemd/user/wmii@.service @@ -1,17 +1,19 @@ [Unit] Description=Window Manager Improved Improved on X display %I Documentation=file:/usr/share/doc/wmii/wmii.pdf -Before=wm@%i.target -StopWhenUnneeded=true +After=X11@%i.target +Requisite=X11@%i.target +Before=wm-running@%i.target [Service] +Environment=DISPLAY=%I + # This assumes that you write READY=1 to $NOTIFY_SOCKET in wmiirc Type=notify NotifyAccess=all -Environment=DISPLAY=%I ExecStart=/usr/bin/bash -l -c 'exec 8>${XDG_RUNTIME_DIR}/x11-wm@%I; exec /usr/bin/wmii' ExecStop=/usr/bin/wmiir xwrite /ctl Quit [Install] -RequiredBy=wm@%i.service +RequiredBy=X11@%i.target diff --git a/.config/systemd/user/x0vncserver@.service b/.config/systemd/user/x0vncserver@.service index 3ee349f..4a995f6 100644 --- a/.config/systemd/user/x0vncserver@.service +++ b/.config/systemd/user/x0vncserver@.service @@ -1,9 +1,10 @@ [Unit] Description=VNC server for real X display %I Conflicts=vncserver@%i.service -StopWhenUnneeded=true +After=X11@%i.target +Requisite=X11@%i.target [Service] + Type=simple ExecStart=/usr/bin/x0vncserver display=%I PasswordFile=%h/.vnc/passwd -Restart=always diff --git a/.config/systemd/user/xcompmgr@.service b/.config/systemd/user/xcompmgr@.service index 85decd2..6d80218 100644 --- a/.config/systemd/user/xcompmgr@.service +++ b/.config/systemd/user/xcompmgr@.service @@ -2,9 +2,11 @@ Description=Composite Window-Effects Manger on X display %I Documentation=man:xcompmgr(1) StopWhenUnneeded=true +After=X11@%i.target +Requisite=X11@%i.target [Service] -Type=simple Environment=DISPLAY=%I + +Type=simple ExecStart=/usr/bin/xcompmgr -Restart=always -- cgit v1.2.3