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') 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-54-g00ecf 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 - .config/wmii-hg/rbar_acpi | 2 +- 3 files changed, 1 insertion(+), 3 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') 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 diff --git a/.config/wmii-hg/rbar_acpi b/.config/wmii-hg/rbar_acpi index bdcdf0f..5e77abb 100755 --- a/.config/wmii-hg/rbar_acpi +++ b/.config/wmii-hg/rbar_acpi @@ -5,7 +5,7 @@ update() { setup_trap "${id}.*" while true; do - acpi -bt | sed -r \ + acpi -t | sed -r \ -e 's/^([A-Z])[a-z]+ ([0-9]+):/\1\2:/' \ -e 's/\s*degrees\s*/°/g' | cat -n | while read -r n line; do -- cgit v1.2.3-54-g00ecf