From 0e67aadb031f8b16e50e97b60fef56060185e789 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Oct 2014 17:09:23 -0400 Subject: Update emacs config --- .config/systemd/user/default.target.wants/emacs-daemon.service | 1 + 1 file changed, 1 insertion(+) (limited to '.config/systemd/user') diff --git a/.config/systemd/user/default.target.wants/emacs-daemon.service b/.config/systemd/user/default.target.wants/emacs-daemon.service index ef8f65f..279d83a 100644 --- a/.config/systemd/user/default.target.wants/emacs-daemon.service +++ b/.config/systemd/user/default.target.wants/emacs-daemon.service @@ -4,6 +4,7 @@ Description=Emacs deamon [Service] Type=forking ExecStart=/bin/bash -l -c 'emacs --daemon' +ExecStop=/bin/bash -l -c 'emacsclient -e "(kill-emacs)"' [Install] WantedBy=default.target -- cgit v1.2.3-2-g168b From c17c631a9f835eca8dd09a5aaf6039a3cfd9354b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Oct 2014 17:14:36 -0400 Subject: systemd --- .config/systemd/user/default.target.wants/batterymon.service | 9 --------- .../systemd/user/default.target.wants/maildirproc@att.service | 1 + .../user/default.target.wants/maildirproc@purdue.service | 1 + .config/systemd/user/default.target.wants/vncserver@1.service | 1 + .config/systemd/user/maildirproc@.service | 10 ++++++++++ .config/systemd/user/vncserver@.service | 11 +++++++++++ 6 files changed, 24 insertions(+), 9 deletions(-) delete mode 100644 .config/systemd/user/default.target.wants/batterymon.service create mode 120000 .config/systemd/user/default.target.wants/maildirproc@att.service create mode 120000 .config/systemd/user/default.target.wants/maildirproc@purdue.service create mode 120000 .config/systemd/user/default.target.wants/vncserver@1.service create mode 100644 .config/systemd/user/maildirproc@.service create mode 100644 .config/systemd/user/vncserver@.service (limited to '.config/systemd/user') diff --git a/.config/systemd/user/default.target.wants/batterymon.service b/.config/systemd/user/default.target.wants/batterymon.service deleted file mode 100644 index c8abc0d..0000000 --- a/.config/systemd/user/default.target.wants/batterymon.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Battery monitor - -[Service] -Type=simple -ExecStart=/usr/bin/batterymon 20 "amixer sset Master unmute 100%; espeak 'PLUG ME IN'; sleep 7;" - -[Install] -WantedBy=default.target diff --git a/.config/systemd/user/default.target.wants/maildirproc@att.service b/.config/systemd/user/default.target.wants/maildirproc@att.service new file mode 120000 index 0000000..1079515 --- /dev/null +++ b/.config/systemd/user/default.target.wants/maildirproc@att.service @@ -0,0 +1 @@ +/home/luke/.config/systemd/user/maildirproc@.service \ No newline at end of file diff --git a/.config/systemd/user/default.target.wants/maildirproc@purdue.service b/.config/systemd/user/default.target.wants/maildirproc@purdue.service new file mode 120000 index 0000000..1079515 --- /dev/null +++ b/.config/systemd/user/default.target.wants/maildirproc@purdue.service @@ -0,0 +1 @@ +/home/luke/.config/systemd/user/maildirproc@.service \ No newline at end of file diff --git a/.config/systemd/user/default.target.wants/vncserver@1.service b/.config/systemd/user/default.target.wants/vncserver@1.service new file mode 120000 index 0000000..2dcf488 --- /dev/null +++ b/.config/systemd/user/default.target.wants/vncserver@1.service @@ -0,0 +1 @@ +/home/luke/.config/systemd/user/vncserver@.service \ No newline at end of file diff --git a/.config/systemd/user/maildirproc@.service b/.config/systemd/user/maildirproc@.service new file mode 100644 index 0000000..bdca746 --- /dev/null +++ b/.config/systemd/user/maildirproc@.service @@ -0,0 +1,10 @@ +[Unit] +Description=maildirproc mail filter + +[Service] +Type=simple +ExecStart=/usr/bin/maildirproc -r ${HOME}/.config/maildirproc/%I.rc +Restart=on-failure + +[Install] +WantedBy=default.target diff --git a/.config/systemd/user/vncserver@.service b/.config/systemd/user/vncserver@.service new file mode 100644 index 0000000..fa616d6 --- /dev/null +++ b/.config/systemd/user/vncserver@.service @@ -0,0 +1,11 @@ +[Unit] +Description=VNC desktop + +[Service] +Type=simple +ExecStart=/bin/bash -l -c 'vncserver -fg :%I' +Restart=always +ExecStopPost=/bin/rm /tmp/.X%I-lock /tmp/.X11-unix/X%I + +[Install] +WantedBy=default.target -- cgit v1.2.3-2-g168b From 3fed229c02272767ad4b925afcbf73f43be0afbe Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 1 Jan 2015 16:41:20 -0500 Subject: gpg-agent does not need to be run explictly anymore --- .config/systemd/user/default.target.wants/gpg-agent.service | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .config/systemd/user/default.target.wants/gpg-agent.service (limited to '.config/systemd/user') diff --git a/.config/systemd/user/default.target.wants/gpg-agent.service b/.config/systemd/user/default.target.wants/gpg-agent.service deleted file mode 100644 index 93c12b0..0000000 --- a/.config/systemd/user/default.target.wants/gpg-agent.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description="GnuPG agent daemon" - -[Service] -Type=forking -ExecStart=/usr/bin/gpg-agent --daemon --write-env-file ${XDG_RUNTIME_DIR}/gpg - -[Install] -WantedBy=default.target -- cgit v1.2.3-2-g168b From 6a5bd645c59b44ae87d09cf350b38e04fbf99d81 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 1 Jan 2015 16:41:56 -0500 Subject: add changes in .conf/systemd --- .../systemd/user/default.target.wants/emacs-daemon.service | 11 +---------- .config/systemd/user/emacs-daemon.service | 10 ++++++++++ .config/systemd/user/x0vncserver@.service | 10 ++++++++++ 3 files changed, 21 insertions(+), 10 deletions(-) mode change 100644 => 120000 .config/systemd/user/default.target.wants/emacs-daemon.service create mode 100644 .config/systemd/user/emacs-daemon.service create mode 100644 .config/systemd/user/x0vncserver@.service (limited to '.config/systemd/user') diff --git a/.config/systemd/user/default.target.wants/emacs-daemon.service b/.config/systemd/user/default.target.wants/emacs-daemon.service deleted file mode 100644 index 279d83a..0000000 --- a/.config/systemd/user/default.target.wants/emacs-daemon.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Emacs deamon - -[Service] -Type=forking -ExecStart=/bin/bash -l -c 'emacs --daemon' -ExecStop=/bin/bash -l -c 'emacsclient -e "(kill-emacs)"' - -[Install] -WantedBy=default.target diff --git a/.config/systemd/user/default.target.wants/emacs-daemon.service b/.config/systemd/user/default.target.wants/emacs-daemon.service new file mode 120000 index 0000000..5a3b3f7 --- /dev/null +++ b/.config/systemd/user/default.target.wants/emacs-daemon.service @@ -0,0 +1 @@ +/home/luke/.config/systemd/user/emacs-daemon.service \ No newline at end of file diff --git a/.config/systemd/user/emacs-daemon.service b/.config/systemd/user/emacs-daemon.service new file mode 100644 index 0000000..279d83a --- /dev/null +++ b/.config/systemd/user/emacs-daemon.service @@ -0,0 +1,10 @@ +[Unit] +Description=Emacs deamon + +[Service] +Type=forking +ExecStart=/bin/bash -l -c 'emacs --daemon' +ExecStop=/bin/bash -l -c 'emacsclient -e "(kill-emacs)"' + +[Install] +WantedBy=default.target diff --git a/.config/systemd/user/x0vncserver@.service b/.config/systemd/user/x0vncserver@.service new file mode 100644 index 0000000..99e897c --- /dev/null +++ b/.config/systemd/user/x0vncserver@.service @@ -0,0 +1,10 @@ +[Unit] +Description=VNC server for X displays + +[Service] +Type=simple +ExecStart=/bin/bash -l -c 'x0vncserver display=:%I PasswordFile="${HOME}/.vnc/passwd"' +Restart=always + +[Install] +WantedBy=default.target -- cgit v1.2.3-2-g168b From 952768c46ae11e0bb1cb01f527153f6cd2d9ba62 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 6 Jan 2015 13:22:47 -0500 Subject: clean up systemd configuration --- .../systemd/user/default.target.wants/emacs-daemon.service | 11 +---------- .config/systemd/user/default.target.wants/gpg-agent.service | 10 +--------- .../systemd/user/default.target.wants/maildirproc@att.service | 1 - .../user/default.target.wants/maildirproc@purdue.service | 1 - .config/systemd/user/default.target.wants/vncserver@1.service | 1 - .config/systemd/user/emacs-daemon.service | 10 ++++++++++ .config/systemd/user/gpg-agent.service | 9 +++++++++ .config/systemd/user/redshift@.service | 11 +++++++++++ .config/systemd/user/vncserver@.service | 2 +- 9 files changed, 33 insertions(+), 23 deletions(-) mode change 100644 => 120000 .config/systemd/user/default.target.wants/emacs-daemon.service mode change 100644 => 120000 .config/systemd/user/default.target.wants/gpg-agent.service delete mode 120000 .config/systemd/user/default.target.wants/maildirproc@att.service delete mode 120000 .config/systemd/user/default.target.wants/maildirproc@purdue.service delete mode 120000 .config/systemd/user/default.target.wants/vncserver@1.service create mode 100644 .config/systemd/user/emacs-daemon.service create mode 100644 .config/systemd/user/gpg-agent.service create mode 100644 .config/systemd/user/redshift@.service (limited to '.config/systemd/user') diff --git a/.config/systemd/user/default.target.wants/emacs-daemon.service b/.config/systemd/user/default.target.wants/emacs-daemon.service deleted file mode 100644 index 279d83a..0000000 --- a/.config/systemd/user/default.target.wants/emacs-daemon.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Emacs deamon - -[Service] -Type=forking -ExecStart=/bin/bash -l -c 'emacs --daemon' -ExecStop=/bin/bash -l -c 'emacsclient -e "(kill-emacs)"' - -[Install] -WantedBy=default.target diff --git a/.config/systemd/user/default.target.wants/emacs-daemon.service b/.config/systemd/user/default.target.wants/emacs-daemon.service new file mode 120000 index 0000000..106cf42 --- /dev/null +++ b/.config/systemd/user/default.target.wants/emacs-daemon.service @@ -0,0 +1 @@ +/home/lukeshu-parabola/.config/systemd/user/emacs-daemon.service \ No newline at end of file diff --git a/.config/systemd/user/default.target.wants/gpg-agent.service b/.config/systemd/user/default.target.wants/gpg-agent.service deleted file mode 100644 index 93c12b0..0000000 --- a/.config/systemd/user/default.target.wants/gpg-agent.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description="GnuPG agent daemon" - -[Service] -Type=forking -ExecStart=/usr/bin/gpg-agent --daemon --write-env-file ${XDG_RUNTIME_DIR}/gpg - -[Install] -WantedBy=default.target diff --git a/.config/systemd/user/default.target.wants/gpg-agent.service b/.config/systemd/user/default.target.wants/gpg-agent.service new file mode 120000 index 0000000..5727454 --- /dev/null +++ b/.config/systemd/user/default.target.wants/gpg-agent.service @@ -0,0 +1 @@ +/home/lukeshu-parabola/.config/systemd/user/gpg-agent.service \ No newline at end of file diff --git a/.config/systemd/user/default.target.wants/maildirproc@att.service b/.config/systemd/user/default.target.wants/maildirproc@att.service deleted file mode 120000 index 1079515..0000000 --- a/.config/systemd/user/default.target.wants/maildirproc@att.service +++ /dev/null @@ -1 +0,0 @@ -/home/luke/.config/systemd/user/maildirproc@.service \ No newline at end of file diff --git a/.config/systemd/user/default.target.wants/maildirproc@purdue.service b/.config/systemd/user/default.target.wants/maildirproc@purdue.service deleted file mode 120000 index 1079515..0000000 --- a/.config/systemd/user/default.target.wants/maildirproc@purdue.service +++ /dev/null @@ -1 +0,0 @@ -/home/luke/.config/systemd/user/maildirproc@.service \ No newline at end of file diff --git a/.config/systemd/user/default.target.wants/vncserver@1.service b/.config/systemd/user/default.target.wants/vncserver@1.service deleted file mode 120000 index 2dcf488..0000000 --- a/.config/systemd/user/default.target.wants/vncserver@1.service +++ /dev/null @@ -1 +0,0 @@ -/home/luke/.config/systemd/user/vncserver@.service \ No newline at end of file diff --git a/.config/systemd/user/emacs-daemon.service b/.config/systemd/user/emacs-daemon.service new file mode 100644 index 0000000..279d83a --- /dev/null +++ b/.config/systemd/user/emacs-daemon.service @@ -0,0 +1,10 @@ +[Unit] +Description=Emacs deamon + +[Service] +Type=forking +ExecStart=/bin/bash -l -c 'emacs --daemon' +ExecStop=/bin/bash -l -c 'emacsclient -e "(kill-emacs)"' + +[Install] +WantedBy=default.target diff --git a/.config/systemd/user/gpg-agent.service b/.config/systemd/user/gpg-agent.service new file mode 100644 index 0000000..93c12b0 --- /dev/null +++ b/.config/systemd/user/gpg-agent.service @@ -0,0 +1,9 @@ +[Unit] +Description="GnuPG agent daemon" + +[Service] +Type=forking +ExecStart=/usr/bin/gpg-agent --daemon --write-env-file ${XDG_RUNTIME_DIR}/gpg + +[Install] +WantedBy=default.target diff --git a/.config/systemd/user/redshift@.service b/.config/systemd/user/redshift@.service new file mode 100644 index 0000000..41a0b7a --- /dev/null +++ b/.config/systemd/user/redshift@.service @@ -0,0 +1,11 @@ +[Unit] +Description=Redshift display colour temperature adjustment +Documentation=http://jonls.dk/redshift/ + +[Service] +Environment=DISPLAY=%I +ExecStart=/usr/bin/redshift +Restart=always + +[Install] +WantedBy=default.target diff --git a/.config/systemd/user/vncserver@.service b/.config/systemd/user/vncserver@.service index fa616d6..ef83ef2 100644 --- a/.config/systemd/user/vncserver@.service +++ b/.config/systemd/user/vncserver@.service @@ -3,7 +3,7 @@ Description=VNC desktop [Service] Type=simple -ExecStart=/bin/bash -l -c 'vncserver -fg :%I' +ExecStart=/bin/bash -l -c 'vncserver -fg %I' Restart=always ExecStopPost=/bin/rm /tmp/.X%I-lock /tmp/.X11-unix/X%I -- cgit v1.2.3-2-g168b From a9935b7a12a522937d91cb44a0e138132b555e16 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 29 Jan 2015 00:48:11 -0500 Subject: Re-jigger to use systemd for the process monitor for the window manager --- .config/systemd/user/dunst@.service | 10 ++++++++++ .config/systemd/user/lxpanel@.service | 10 ++++++++++ .config/systemd/user/rbar@.service | 7 +++++++ .config/systemd/user/redshift@.service | 6 +++--- .config/systemd/user/wmii@.service | 12 ++++++++++++ .config/systemd/user/wmii@.service.wants/lxpanel@.service | 1 + .../systemd/user/wmii@.service.wants/rbar@97_acpi.service | 1 + .../systemd/user/wmii@.service.wants/rbar@98_wifi.service | 1 + .../systemd/user/wmii@.service.wants/rbar@99_clock.service | 1 + .config/systemd/user/wmii@.service.wants/redshift@.service | 1 + .config/systemd/user/wmii@.service.wants/xcompmgr@.service | 1 + .config/systemd/user/xcompmgr@.service | 10 ++++++++++ 12 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 .config/systemd/user/dunst@.service create mode 100644 .config/systemd/user/lxpanel@.service create mode 100644 .config/systemd/user/rbar@.service create mode 100644 .config/systemd/user/wmii@.service create mode 120000 .config/systemd/user/wmii@.service.wants/lxpanel@.service create mode 120000 .config/systemd/user/wmii@.service.wants/rbar@97_acpi.service create mode 120000 .config/systemd/user/wmii@.service.wants/rbar@98_wifi.service create mode 120000 .config/systemd/user/wmii@.service.wants/rbar@99_clock.service create mode 120000 .config/systemd/user/wmii@.service.wants/redshift@.service create mode 120000 .config/systemd/user/wmii@.service.wants/xcompmgr@.service create mode 100644 .config/systemd/user/xcompmgr@.service (limited to '.config/systemd/user') diff --git a/.config/systemd/user/dunst@.service b/.config/systemd/user/dunst@.service new file mode 100644 index 0000000..2aff6be --- /dev/null +++ b/.config/systemd/user/dunst@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Dunst notification-daemon +Documentation=man:dunst(1) +StopWhenUnneeded=true + +[Service] +Type=simple +Environment=DISPLAY=%I +ExecStart=/usr/bin/dunst +Restart=always diff --git a/.config/systemd/user/lxpanel@.service b/.config/systemd/user/lxpanel@.service new file mode 100644 index 0000000..3327ab4 --- /dev/null +++ b/.config/systemd/user/lxpanel@.service @@ -0,0 +1,10 @@ +[Unit] +Description=LXDE Desktop Panel +Documentation=man:lxpanel(1) +StopWhenUnneeded=true + +[Service] +Type=simple +Environment=DISPLAY=%I +ExecStart=/usr/bin/lxpanel +Restart=always diff --git a/.config/systemd/user/rbar@.service b/.config/systemd/user/rbar@.service new file mode 100644 index 0000000..18d6201 --- /dev/null +++ b/.config/systemd/user/rbar@.service @@ -0,0 +1,7 @@ +[Unit] +Description=WMII rbar %I +StopWhenUnneeded=true + +[Service] +Type=simple +ExecStart=/usr/bin/bash -c '%h/.wmii-hg/rbar %I' diff --git a/.config/systemd/user/redshift@.service b/.config/systemd/user/redshift@.service index 41a0b7a..149bb74 100644 --- a/.config/systemd/user/redshift@.service +++ b/.config/systemd/user/redshift@.service @@ -1,11 +1,11 @@ [Unit] Description=Redshift display colour temperature adjustment Documentation=http://jonls.dk/redshift/ +StopWhenUnneeded=true [Service] +Type=simple Environment=DISPLAY=%I ExecStart=/usr/bin/redshift +ExecStopPost=/usr/bin/redshift -x Restart=always - -[Install] -WantedBy=default.target diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service new file mode 100644 index 0000000..10fc4e9 --- /dev/null +++ b/.config/systemd/user/wmii@.service @@ -0,0 +1,12 @@ +[Unit] +Description=Window Manager Improved Improved +Documentation=file:/usr/share/doc/wmii/wmii.pdf + +[Service] +Type=simple +Restart=no + +Environment=DISPLAY=%I +ExecStart=/usr/bin/bash -l -c /usr/bin/wmii +ExecStop=/usr/bin/wmiir xwrite /ctl Quit +ExecStopPost=/usr/bin/bash -c ": > ${XDG_RUNTIME_DIR}/x11-wm@%I" diff --git a/.config/systemd/user/wmii@.service.wants/lxpanel@.service b/.config/systemd/user/wmii@.service.wants/lxpanel@.service new file mode 120000 index 0000000..06ed03f --- /dev/null +++ b/.config/systemd/user/wmii@.service.wants/lxpanel@.service @@ -0,0 +1 @@ +../lxpanel@.service \ No newline at end of file diff --git a/.config/systemd/user/wmii@.service.wants/rbar@97_acpi.service b/.config/systemd/user/wmii@.service.wants/rbar@97_acpi.service new file mode 120000 index 0000000..286989e --- /dev/null +++ b/.config/systemd/user/wmii@.service.wants/rbar@97_acpi.service @@ -0,0 +1 @@ +../rbar@.service \ No newline at end of file diff --git a/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service b/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service new file mode 120000 index 0000000..286989e --- /dev/null +++ b/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service @@ -0,0 +1 @@ +../rbar@.service \ No newline at end of file diff --git a/.config/systemd/user/wmii@.service.wants/rbar@99_clock.service b/.config/systemd/user/wmii@.service.wants/rbar@99_clock.service new file mode 120000 index 0000000..286989e --- /dev/null +++ b/.config/systemd/user/wmii@.service.wants/rbar@99_clock.service @@ -0,0 +1 @@ +../rbar@.service \ No newline at end of file diff --git a/.config/systemd/user/wmii@.service.wants/redshift@.service b/.config/systemd/user/wmii@.service.wants/redshift@.service new file mode 120000 index 0000000..59234a7 --- /dev/null +++ b/.config/systemd/user/wmii@.service.wants/redshift@.service @@ -0,0 +1 @@ +../redshift@.service \ No newline at end of file diff --git a/.config/systemd/user/wmii@.service.wants/xcompmgr@.service b/.config/systemd/user/wmii@.service.wants/xcompmgr@.service new file mode 120000 index 0000000..be8518c --- /dev/null +++ b/.config/systemd/user/wmii@.service.wants/xcompmgr@.service @@ -0,0 +1 @@ +../xcompmgr@.service \ No newline at end of file diff --git a/.config/systemd/user/xcompmgr@.service b/.config/systemd/user/xcompmgr@.service new file mode 100644 index 0000000..c7844d2 --- /dev/null +++ b/.config/systemd/user/xcompmgr@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Composite Window-Effects Manger +Documentation=man:xcompmgr(1) +StopWhenUnneeded=true + +[Service] +Type=simple +Environment=DISPLAY=%I +ExecStart=/usr/bin/xcompmgr +Restart=always -- cgit v1.2.3-2-g168b From f565769cdc68b24343ce2d3dbf4e322fad3a6c20 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 29 Jan 2015 00:54:28 -0500 Subject: gpg-agent stuff is no longer nescessary --- .config/systemd/user/default.target.wants/gpg-agent.service | 1 - .config/systemd/user/gpg-agent.service | 9 --------- 2 files changed, 10 deletions(-) delete mode 120000 .config/systemd/user/default.target.wants/gpg-agent.service delete mode 100644 .config/systemd/user/gpg-agent.service (limited to '.config/systemd/user') diff --git a/.config/systemd/user/default.target.wants/gpg-agent.service b/.config/systemd/user/default.target.wants/gpg-agent.service deleted file mode 120000 index 5727454..0000000 --- a/.config/systemd/user/default.target.wants/gpg-agent.service +++ /dev/null @@ -1 +0,0 @@ -/home/lukeshu-parabola/.config/systemd/user/gpg-agent.service \ No newline at end of file diff --git a/.config/systemd/user/gpg-agent.service b/.config/systemd/user/gpg-agent.service deleted file mode 100644 index 93c12b0..0000000 --- a/.config/systemd/user/gpg-agent.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description="GnuPG agent daemon" - -[Service] -Type=forking -ExecStart=/usr/bin/gpg-agent --daemon --write-env-file ${XDG_RUNTIME_DIR}/gpg - -[Install] -WantedBy=default.target -- cgit v1.2.3-2-g168b From 34bbf66a460e5c622e209211869b3a8bde8a68d5 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 29 Jan 2015 01:31:57 -0500 Subject: change the x0vncserver service unit to match the others --- .config/systemd/user/wmii@.service.wants/x0vncserver@.service | 1 + .config/systemd/user/x0vncserver@.service | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) create mode 120000 .config/systemd/user/wmii@.service.wants/x0vncserver@.service (limited to '.config/systemd/user') diff --git a/.config/systemd/user/wmii@.service.wants/x0vncserver@.service b/.config/systemd/user/wmii@.service.wants/x0vncserver@.service new file mode 120000 index 0000000..bc3be20 --- /dev/null +++ b/.config/systemd/user/wmii@.service.wants/x0vncserver@.service @@ -0,0 +1 @@ +../x0vncserver@.service \ No newline at end of file diff --git a/.config/systemd/user/x0vncserver@.service b/.config/systemd/user/x0vncserver@.service index 99e897c..476e822 100644 --- a/.config/systemd/user/x0vncserver@.service +++ b/.config/systemd/user/x0vncserver@.service @@ -3,8 +3,5 @@ Description=VNC server for X displays [Service] Type=simple -ExecStart=/bin/bash -l -c 'x0vncserver display=:%I PasswordFile="${HOME}/.vnc/passwd"' +ExecStart=/usr/bin/x0vncserver display=%I PasswordFile=%h/.vnc/passwd Restart=always - -[Install] -WantedBy=default.target -- cgit v1.2.3-2-g168b From c9a99ea8e015a34626a524a0e8be3c5378961894 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 29 Jan 2015 01:48:45 -0500 Subject: systemd: {x0,}vncserver need to conflict with eachother --- .config/systemd/user/vncserver@.service | 1 + .config/systemd/user/x0vncserver@.service | 1 + 2 files changed, 2 insertions(+) (limited to '.config/systemd/user') diff --git a/.config/systemd/user/vncserver@.service b/.config/systemd/user/vncserver@.service index ef83ef2..8c1d818 100644 --- a/.config/systemd/user/vncserver@.service +++ b/.config/systemd/user/vncserver@.service @@ -1,5 +1,6 @@ [Unit] Description=VNC desktop +Conflicts=x0vncserver@%i.service [Service] Type=simple diff --git a/.config/systemd/user/x0vncserver@.service b/.config/systemd/user/x0vncserver@.service index 476e822..02165a7 100644 --- a/.config/systemd/user/x0vncserver@.service +++ b/.config/systemd/user/x0vncserver@.service @@ -1,5 +1,6 @@ [Unit] Description=VNC server for X displays +Conflicts=vncserver@%i.service [Service] Type=simple -- cgit v1.2.3-2-g168b From b844c786dbb22a45a218e183dcecd58cdbb66025 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 29 Jan 2015 01:59:53 -0500 Subject: fix merge --- .config/systemd/user/wmii@.service.wants/rbar@98_wifi.service | 1 - .config/systemd/user/wmii@.service.wants/redshift@.service | 1 - 2 files changed, 2 deletions(-) delete mode 120000 .config/systemd/user/wmii@.service.wants/rbar@98_wifi.service delete mode 120000 .config/systemd/user/wmii@.service.wants/redshift@.service (limited to '.config/systemd/user') diff --git a/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service b/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service deleted file mode 120000 index 286989e..0000000 --- a/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service +++ /dev/null @@ -1 +0,0 @@ -../rbar@.service \ No newline at end of file diff --git a/.config/systemd/user/wmii@.service.wants/redshift@.service b/.config/systemd/user/wmii@.service.wants/redshift@.service deleted file mode 120000 index 59234a7..0000000 --- a/.config/systemd/user/wmii@.service.wants/redshift@.service +++ /dev/null @@ -1 +0,0 @@ -../redshift@.service \ No newline at end of file -- cgit v1.2.3-2-g168b From 28be8fb283a3f56521a8c8d98553ceae17513599 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 2 Feb 2015 12:45:12 -0500 Subject: window manager: do better error handling round my semaphore --- .config/systemd/user/wmii@.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.config/systemd/user') diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service index 10fc4e9..12f585b 100644 --- a/.config/systemd/user/wmii@.service +++ b/.config/systemd/user/wmii@.service @@ -9,4 +9,4 @@ Restart=no Environment=DISPLAY=%I ExecStart=/usr/bin/bash -l -c /usr/bin/wmii ExecStop=/usr/bin/wmiir xwrite /ctl Quit -ExecStopPost=/usr/bin/bash -c ": > ${XDG_RUNTIME_DIR}/x11-wm@%I" +ExecStopPost=/usr/bin/timeout .1 bash -c ": > ${XDG_RUNTIME_DIR}/x11-wm@%I" -- cgit v1.2.3-2-g168b From a41c113539cab32ccf697219ef024735bc6fd866 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 3 Feb 2015 11:01:50 -0500 Subject: systemd: wmii@: do the handshake by attaching an FD to wmii itself --- .config/systemd/user/wmii@.service | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '.config/systemd/user') diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service index 12f585b..3902627 100644 --- a/.config/systemd/user/wmii@.service +++ b/.config/systemd/user/wmii@.service @@ -7,6 +7,5 @@ Type=simple Restart=no Environment=DISPLAY=%I -ExecStart=/usr/bin/bash -l -c /usr/bin/wmii +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 -ExecStopPost=/usr/bin/timeout .1 bash -c ": > ${XDG_RUNTIME_DIR}/x11-wm@%I" -- cgit v1.2.3-2-g168b From 7fa8100ee556f0c94adfb91a240001ce86104c48 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 4 Feb 2015 15:13:00 -0500 Subject: systemd: Add and use wm@$DISPLAY.target wm@.target to change the default window manager. Create wm@$DISPLAY to override for a particular display --- .config/systemd/user/lxpanel@.service | 1 + .config/systemd/user/wm@.target | 3 +++ .config/systemd/user/wmii@.service | 7 +++++-- .config/systemd/user/x0vncserver@.service | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .config/systemd/user/wm@.target (limited to '.config/systemd/user') diff --git a/.config/systemd/user/lxpanel@.service b/.config/systemd/user/lxpanel@.service index 3327ab4..fa4dcb4 100644 --- a/.config/systemd/user/lxpanel@.service +++ b/.config/systemd/user/lxpanel@.service @@ -2,6 +2,7 @@ Description=LXDE Desktop Panel Documentation=man:lxpanel(1) StopWhenUnneeded=true +After=wm@%i.target [Service] Type=simple diff --git a/.config/systemd/user/wm@.target b/.config/systemd/user/wm@.target new file mode 100644 index 0000000..ac91fa1 --- /dev/null +++ b/.config/systemd/user/wm@.target @@ -0,0 +1,3 @@ +[Unit] +Description=Window Manager on display %I +Requires=wmii@%i.service diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service index 3902627..602bdb8 100644 --- a/.config/systemd/user/wmii@.service +++ b/.config/systemd/user/wmii@.service @@ -1,10 +1,13 @@ [Unit] Description=Window Manager Improved Improved Documentation=file:/usr/share/doc/wmii/wmii.pdf +Before=wm@%i.target +StopWhenUnneeded=true [Service] -Type=simple -Restart=no +# 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' diff --git a/.config/systemd/user/x0vncserver@.service b/.config/systemd/user/x0vncserver@.service index 02165a7..21a3b7b 100644 --- a/.config/systemd/user/x0vncserver@.service +++ b/.config/systemd/user/x0vncserver@.service @@ -1,6 +1,7 @@ [Unit] Description=VNC server for X displays Conflicts=vncserver@%i.service +StopWhenUnneeded=true [Service] Type=simple -- cgit v1.2.3-2-g168b From afd40978d6ac72c47085f0ae2265c3893596abc3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 4 Feb 2015 15:15:27 -0500 Subject: systemd: Add the %I/DISPLAY to the descriptions --- .config/systemd/user/dunst@.service | 2 +- .config/systemd/user/lxpanel@.service | 2 +- .config/systemd/user/redshift@.service | 2 +- .config/systemd/user/vncserver@.service | 5 +++-- .config/systemd/user/wmii@.service | 2 +- .config/systemd/user/x0vncserver@.service | 2 +- .config/systemd/user/xcompmgr@.service | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) (limited to '.config/systemd/user') diff --git a/.config/systemd/user/dunst@.service b/.config/systemd/user/dunst@.service index 2aff6be..568af3f 100644 --- a/.config/systemd/user/dunst@.service +++ b/.config/systemd/user/dunst@.service @@ -1,5 +1,5 @@ [Unit] -Description=Dunst notification-daemon +Description=Dunst notification-daemon on X display %I Documentation=man:dunst(1) StopWhenUnneeded=true diff --git a/.config/systemd/user/lxpanel@.service b/.config/systemd/user/lxpanel@.service index fa4dcb4..71e2114 100644 --- a/.config/systemd/user/lxpanel@.service +++ b/.config/systemd/user/lxpanel@.service @@ -1,5 +1,5 @@ [Unit] -Description=LXDE Desktop Panel +Description=LXDE Desktop Panel on X display %I Documentation=man:lxpanel(1) StopWhenUnneeded=true After=wm@%i.target diff --git a/.config/systemd/user/redshift@.service b/.config/systemd/user/redshift@.service index 149bb74..b4ef3bb 100644 --- a/.config/systemd/user/redshift@.service +++ b/.config/systemd/user/redshift@.service @@ -1,5 +1,5 @@ [Unit] -Description=Redshift display colour temperature adjustment +Description=Redshift display colour temperature adjustment on X display %I Documentation=http://jonls.dk/redshift/ StopWhenUnneeded=true diff --git a/.config/systemd/user/vncserver@.service b/.config/systemd/user/vncserver@.service index 8c1d818..2433977 100644 --- a/.config/systemd/user/vncserver@.service +++ b/.config/systemd/user/vncserver@.service @@ -1,11 +1,12 @@ [Unit] -Description=VNC desktop +Description=VNC virtual desktop %I Conflicts=x0vncserver@%i.service [Service] Type=simple -ExecStart=/bin/bash -l -c 'vncserver -fg %I' Restart=always + +ExecStart=/bin/bash -l -c 'vncserver -fg %I' ExecStopPost=/bin/rm /tmp/.X%I-lock /tmp/.X11-unix/X%I [Install] diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service index 602bdb8..0442fca 100644 --- a/.config/systemd/user/wmii@.service +++ b/.config/systemd/user/wmii@.service @@ -1,5 +1,5 @@ [Unit] -Description=Window Manager Improved Improved +Description=Window Manager Improved Improved on X display %I Documentation=file:/usr/share/doc/wmii/wmii.pdf Before=wm@%i.target StopWhenUnneeded=true diff --git a/.config/systemd/user/x0vncserver@.service b/.config/systemd/user/x0vncserver@.service index 21a3b7b..3ee349f 100644 --- a/.config/systemd/user/x0vncserver@.service +++ b/.config/systemd/user/x0vncserver@.service @@ -1,5 +1,5 @@ [Unit] -Description=VNC server for X displays +Description=VNC server for real X display %I Conflicts=vncserver@%i.service StopWhenUnneeded=true diff --git a/.config/systemd/user/xcompmgr@.service b/.config/systemd/user/xcompmgr@.service index c7844d2..85decd2 100644 --- a/.config/systemd/user/xcompmgr@.service +++ b/.config/systemd/user/xcompmgr@.service @@ -1,5 +1,5 @@ [Unit] -Description=Composite Window-Effects Manger +Description=Composite Window-Effects Manger on X display %I Documentation=man:xcompmgr(1) StopWhenUnneeded=true -- cgit v1.2.3-2-g168b