14 files changed, 53 insertions, 48 deletions
diff --git a/.config/systemd/user/autocutsel.service b/.config/systemd/user/autocutsel.service
new file mode 100644
index 0000000..495e703
--- /dev/null
+++ b/.config/systemd/user/autocutsel.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Keep the X clipboard and the cutbuffer in sync
+StartLimitIntervalSec=0
+
+[Service]
+Type=forking
+RestartSec=3
+Restart=always
+SyslogIdentifier=autocutsel
+ExecStartPre=/usr/bin/env autocutsel -fork -selection PRIMARY
+ExecStart=/usr/bin/env autocutsel -fork -selection CLIPBOARD
+MemoryHigh=3M
+MemoryMax=5M
+
+[Install]
+WantedBy=default.target
diff --git a/.config/systemd/user/copyq.service b/.config/systemd/user/copyq.service
index cd09ee0..4d9afab 100644
--- a/.config/systemd/user/copyq.service
+++ b/.config/systemd/user/copyq.service
@@ -1,12 +1,13 @@
 [Unit]
 Description=Copyq server
+StartLimitIntervalSec=0
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/env copyq
+RestartSec=3
 Restart=always
-RestartSec=5s
 SyslogIdentifier=copyq
+ExecStart=/usr/bin/env copyq
 
 [Install]
 WantedBy=default.target
diff --git a/.config/systemd/user/events-idle.service b/.config/systemd/user/events-idle.service
index 7c5cdec..62b4edd 100644
--- a/.config/systemd/user/events-idle.service
+++ b/.config/systemd/user/events-idle.service
@@ -1,15 +1,16 @@
 [Unit]
 Description=Execute events on X11 idle
+StartLimitIntervalSec=0
 
 [Service]
 Type=simple
-ExecStartPre=/usr/bin/env sh -c '%h/.local/bin/scripts/events-idle'
-ExecStart=/usr/bin/env sh -c 'while true; do sleep 300 && [ "$(xprintidle)" -gt 120000 ] && %h/.local/bin/scripts/events-idle; done'
+IOWeight=60
+CPUQuota=60%
+RestartSec=5
 Restart=always
-RestartSec=5s
 SyslogIdentifier=events-idle
-CPUQuota=60%
-IOWeight=60
+ExecStartPre=/usr/bin/env sh -c 'events-idle'
+ExecStart=/usr/bin/env sh -c 'while true; do sleep 300 && [ "$(xprintidle)" -gt 120000 ] && events-idle; done'
 
 [Install]
 WantedBy=default.target
diff --git a/.config/systemd/user/events-resume.service b/.config/systemd/user/events-resume.service
index b8bce6a..a65c0a8 100644
--- a/.config/systemd/user/events-resume.service
+++ b/.config/systemd/user/events-resume.service
@@ -1,12 +1,13 @@
 [Unit]
 Description=Execute events on resume event
+StartLimitIntervalSec=0
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/env sh -c 'dbus-monitor --system | while read; do grep -q 'PrepareForSleep' && %h/.local/bin/scripts/events-resume; done'
+RestartSec=3
 Restart=always
-RestartSec=5s
 SyslogIdentifier=events-resume
+ExecStart=/usr/bin/env sh -c 'dbus-monitor --system | while read; do grep -q 'PrepareForSleep' && events-resume; done'
 
 [Install]
 WantedBy=default.target
diff --git a/.config/systemd/user/events-usb.service b/.config/systemd/user/events-usb.service
index d2a5b63..201d171 100644
--- a/.config/systemd/user/events-usb.service
+++ b/.config/systemd/user/events-usb.service
@@ -1,12 +1,13 @@
 [Unit]
 Description=Execute events on kernel usb events
+StartLimitIntervalSec=0
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/env sh -c 'udevadm monitor | while read; do grep -m1 -q "(usb)" && %h/.local/bin/scripts/events-usb; done'
+RestartSec=3
 Restart=always
-RestartSec=5s
 SyslogIdentifier=events-usb
+ExecStart=/usr/bin/env sh -c 'udevadm monitor | while read; do grep -m1 -q "(usb)" && events-usb; done'
 
 [Install]
 WantedBy=default.target
diff --git a/.config/systemd/user/flameshot.service b/.config/systemd/user/flameshot.service
index 431fc04..1761acd 100644
--- a/.config/systemd/user/flameshot.service
+++ b/.config/systemd/user/flameshot.service
@@ -1,12 +1,13 @@
 [Unit]
 Description=Screenshot tool
+StartLimitIntervalSec=0
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/env flameshot
+RestartSec=3
 Restart=always
-RestartSec=5s
 SyslogIdentifier=flameshot
+ExecStart=/usr/bin/env flameshot
 
 [Install]
 WantedBy=default.target
diff --git a/.config/systemd/user/plank.service b/.config/systemd/user/plank.service
index 4f92af7..760e71b 100644
--- a/.config/systemd/user/plank.service
+++ b/.config/systemd/user/plank.service
@@ -4,12 +4,12 @@ StartLimitIntervalSec=0
 
 [Service]
 Type=simple
-Environment=XDG_SESSION_TYPE=X11
-ExecStart=/usr/bin/env plank
+RestartSec=1
 Restart=always
-RestartSec=1s
 KillMode=process
 SyslogIdentifier=plank
+ExecStart=/usr/bin/env plank
+Environment=XDG_SESSION_TYPE=X11
 
 [Install]
 WantedBy=default.target
diff --git a/.config/systemd/user/redshift.service b/.config/systemd/user/redshift.service
index e18f1e4..4392596 100644
--- a/.config/systemd/user/redshift.service
+++ b/.config/systemd/user/redshift.service
@@ -1,12 +1,13 @@
 [Unit]
 Description=Redshift
+StartLimitIntervalSec=0
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/env redshift
+RestartSec=3
 Restart=always
-RestartSec=5s
 SyslogIdentifier=redshift
+ExecStart=/usr/bin/env redshift
 
 [Install]
 WantedBy=default.target
diff --git a/.config/systemd/user/syncthing.service b/.config/systemd/user/syncthing.service
index d1b862c..2e5ebc6 100644
--- a/.config/systemd/user/syncthing.service
+++ b/.config/systemd/user/syncthing.service
@@ -1,21 +1,14 @@
 [Unit]
 Description=Syncthing - Open Source Continuous File Synchronization
-After=network.target
+StartLimitIntervalSec=0
 
 [Service]
-ExecStart=/usr/bin/env syncthing -no-browser -no-restart -logflags=0
+IOWeight=60
+CPUQuota=60%
+RestartSec=3
 Restart=always
-RestartSec=5s
 SyslogIdentifier=syncthing
-CPUQuota=60%
-IOWeight=60
-
-# Hardening
-ProtectSystem=full
-PrivateTmp=true
-SystemCallArchitectures=native
-MemoryDenyWriteExecute=true
-NoNewPrivileges=true
+ExecStart=/usr/bin/env syncthing -no-browser -no-restart -logflags=0
 
 [Install]
 WantedBy=default.target
diff --git a/.config/systemd/user/unclutter.service b/.config/systemd/user/unclutter.service
index ac4941c..78f0c40 100644
--- a/.config/systemd/user/unclutter.service
+++ b/.config/systemd/user/unclutter.service
@@ -1,12 +1,13 @@
 [Unit]
 Description=Hide mouse on idle
+StartLimitIntervalSec=0
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/env unclutter -idle 1
+RestartSec=3
 Restart=always
-RestartSec=5s
 SyslogIdentifier=unclutter
+ExecStart=/usr/bin/env unclutter -idle 1 -grab
 
 [Install]
 WantedBy=default.target
diff --git a/.config/systemd/user/workout-notify.service b/.config/systemd/user/workout-notify.service
index 3ea82f4..e043f07 100644
--- a/.config/systemd/user/workout-notify.service
+++ b/.config/systemd/user/workout-notify.service
@@ -4,5 +4,5 @@ Description=Workout notifications
 [Service]
 Type=oneshot
 Environment=DISPLAY=:0
-ExecStart=%h/.local/bin/scripts/workout-notify
+ExecStart=/usr/bin/env sh -c 'workout-notify'
 SyslogIdentifier=workout-notify
diff --git a/.config/systemd/user/x0vncserver.service b/.config/systemd/user/x0vncserver.service
deleted file mode 100644
index e3e1abe..0000000
--- a/.config/systemd/user/x0vncserver.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Remote desktop service (VNC)
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/env /usr/bin/sh -c '/usr/bin/x0vncserver -rfbport 5900 -RemapKeys="0x3c->0x2c" -passwordfile %h/.vnc/passwd &'
-Restart=always
-RestartSec=5s
-SyslogIdentifier=x0vncserver
-
-[Install]
-WantedBy=default.target
diff --git a/.config/systemd/user/x11vnc.service b/.config/systemd/user/x11vnc.service
index 8e758d2..b055585 100644
--- a/.config/systemd/user/x11vnc.service
+++ b/.config/systemd/user/x11vnc.service
@@ -4,10 +4,10 @@ StartLimitIntervalSec=0
 
 [Service]
 Type=simple
-RestartSec=1s
+RestartSec=3
 Restart=always
 SyslogIdentifier=x11vnc
-ExecStart=/usr/bin/env x11vnc -display :0 -rfbport 5900 -usepw -forever -nowireframe -norepeat -noxdamage -noxrecord -ncache_cr -noxfixes -auth $XAUTHORITY
+ExecStart=/usr/bin/env x11vnc -display $DISPLAY -rfbport 5901 -shared -usepw -forever -nowireframe -norepeat -noxdamage -noxrecord -ncache_cr -noxfixes -cursor arrow -auth $XAUTHORITY
 
 [Install]
 WantedBy=default.target
diff --git a/.config/systemd/user/xbindkeys.service b/.config/systemd/user/xbindkeys.service
index 82eaf76..5f312b8 100644
--- a/.config/systemd/user/xbindkeys.service
+++ b/.config/systemd/user/xbindkeys.service
@@ -1,9 +1,10 @@
 [Unit]
 Description=Keyboard shortcut binder
+StartLimitIntervalSec=0
 
 [Service]
 Type=simple
-RestartSec=5s
+RestartSec=3
 Restart=always
 KillMode=process
 SyslogIdentifier=xbindkeys