diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-10-04 15:08:06 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-10-04 15:08:06 -0400 |
commit | 9685060a9222ae5bdc242c6366f4a074e5ad8589 (patch) | |
tree | 4fde5c1088d69d177852e9964acb38d546144a17 /.config/systemd | |
parent | 4b151e74462b93b68ebbf90502de86b84917bd7c (diff) | |
parent | 795875623f9a9cd35374d2f0531182a267e81588 (diff) |
Merge branch 'master' into build64-par/master
# Conflicts:
# .config/emacs/init.el
Diffstat (limited to '.config/systemd')
-rw-r--r-- | .config/systemd/user/emacs-daemon.service | 2 | ||||
-rw-r--r-- | .config/systemd/user/lxpanel@.service | 4 | ||||
-rw-r--r-- | .config/systemd/user/panel@.target | 3 | ||||
l--------- | .config/systemd/user/panel@.target.requires/lxpanel@.service | 1 | ||||
-rw-r--r-- | .config/systemd/user/synergy@.service | 10 | ||||
-rw-r--r-- | .config/systemd/user/wm@.target | 1 | ||||
l--------- | .config/systemd/user/wm@.target.requires/wmii@.service | 1 | ||||
-rw-r--r-- | .config/systemd/user/wmii@.service | 3 | ||||
l--------- | .config/systemd/user/wmii@.service.wants/dunst@.service | 1 |
9 files changed, 24 insertions, 2 deletions
diff --git a/.config/systemd/user/emacs-daemon.service b/.config/systemd/user/emacs-daemon.service index 279d83a..4077e97 100644 --- a/.config/systemd/user/emacs-daemon.service +++ b/.config/systemd/user/emacs-daemon.service @@ -4,7 +4,7 @@ Description=Emacs deamon [Service] Type=forking ExecStart=/bin/bash -l -c 'emacs --daemon' -ExecStop=/bin/bash -l -c 'emacsclient -e "(kill-emacs)"' +ExecStop=/bin/bash -l -c 'emacsclient -a false -e "(kill-emacs)"' [Install] WantedBy=default.target diff --git a/.config/systemd/user/lxpanel@.service b/.config/systemd/user/lxpanel@.service index 71e2114..ecded87 100644 --- a/.config/systemd/user/lxpanel@.service +++ b/.config/systemd/user/lxpanel@.service @@ -3,9 +3,13 @@ Description=LXDE Desktop Panel on X display %I Documentation=man:lxpanel(1) StopWhenUnneeded=true After=wm@%i.target +Before=panel@%i.target [Service] Type=simple Environment=DISPLAY=%I 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 new file mode 100644 index 0000000..ed3dffd --- /dev/null +++ b/.config/systemd/user/panel@.target @@ -0,0 +1,3 @@ +[Unit] +Description=Desktop Panel (System Tray) on display %I +StopWhenUnneeded=true diff --git a/.config/systemd/user/panel@.target.requires/lxpanel@.service b/.config/systemd/user/panel@.target.requires/lxpanel@.service new file mode 120000 index 0000000..06ed03f --- /dev/null +++ b/.config/systemd/user/panel@.target.requires/lxpanel@.service @@ -0,0 +1 @@ +../lxpanel@.service
\ No newline at end of file diff --git a/.config/systemd/user/synergy@.service b/.config/systemd/user/synergy@.service new file mode 100644 index 0000000..df0640a --- /dev/null +++ b/.config/systemd/user/synergy@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Keyboard and mouse sharing on X display %I +StopWhenUnneeded=true +Requires=panel@%i.target + +[Service] +Type=simple +Environment=DISPLAY=%I +ExecStart=/usr/bin/synergy +Restart=always diff --git a/.config/systemd/user/wm@.target b/.config/systemd/user/wm@.target index ac91fa1..c114bf5 100644 --- a/.config/systemd/user/wm@.target +++ b/.config/systemd/user/wm@.target @@ -1,3 +1,2 @@ [Unit] Description=Window Manager on display %I -Requires=wmii@%i.service diff --git a/.config/systemd/user/wm@.target.requires/wmii@.service b/.config/systemd/user/wm@.target.requires/wmii@.service new file mode 120000 index 0000000..1b202d2 --- /dev/null +++ b/.config/systemd/user/wm@.target.requires/wmii@.service @@ -0,0 +1 @@ +../wmii@.service
\ No newline at end of file diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service index 0442fca..4a81e3f 100644 --- a/.config/systemd/user/wmii@.service +++ b/.config/systemd/user/wmii@.service @@ -12,3 +12,6 @@ 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 diff --git a/.config/systemd/user/wmii@.service.wants/dunst@.service b/.config/systemd/user/wmii@.service.wants/dunst@.service new file mode 120000 index 0000000..7635e45 --- /dev/null +++ b/.config/systemd/user/wmii@.service.wants/dunst@.service @@ -0,0 +1 @@ +../dunst@.service
\ No newline at end of file |