5 files changed, 13 insertions, 1 deletions
diff --git a/systemd/profile.d/systemd.sh b/systemd/profile.d/systemd.sh
new file mode 100644
index 00000000..b5f05c24
--- /dev/null
+++ b/systemd/profile.d/systemd.sh
@@ -0,0 +1,3 @@
+# Use $VISUAL for editing systemd unit files, not $EDITOR
+SYSTEMD_EDITOR=$VISUAL
+export SYSTEMD_EDITOR
diff --git a/systemd/user/notify-email@.service b/systemd/user/notify-email@.service
index fba9cdaf..2d356c79 100644
--- a/systemd/user/notify-email@.service
+++ b/systemd/user/notify-email@.service
@@ -3,5 +3,5 @@ Description=unit status mailer service for %i
 
 [Service]
 Type=oneshot
-ExecStart=sh -c 'systemctl --user status %i | mail -a "X-systemd: %H %m %b" -s "[systemd] %i failure" %u'
+ExecStart=sh -c 'systemctl --user status --full %i | mail -a "X-systemd: %H %m %b" -s "[systemd] %i failure" %u'
 TimeoutStartSec=1m
diff --git a/systemd/user/notify-email@.service.d/50-notify-email.conf b/systemd/user/notify-email@.service.d/50-notify-email.conf
new file mode 100644
index 00000000..dc548c73
--- /dev/null
+++ b/systemd/user/notify-email@.service.d/50-notify-email.conf
@@ -0,0 +1,2 @@
+[Unit]
+OnFailure=
diff --git a/systemd/user/run-.service.d/50-notify-email.conf b/systemd/user/run-.service.d/50-notify-email.conf
new file mode 100644
index 00000000..e5a45b8c
--- /dev/null
+++ b/systemd/user/run-.service.d/50-notify-email.conf
@@ -0,0 +1,5 @@
+[Unit]
+OnFailure=
+
+[Service]
+ExecStopPost=sh -c 'systemctl --user status --full %n | mail -a "X-systemd: %H %m %b" -s "[systemd] %n completed" %u'
diff --git a/systemd/user/service.d/50-notify-email.conf b/systemd/user/service.d/50-notify-email.conf
new file mode 100644
index 00000000..11b8b2f2
--- /dev/null
+++ b/systemd/user/service.d/50-notify-email.conf
@@ -0,0 +1,2 @@
+[Unit]
+OnFailure=notify-email@%N.service