15 files changed, 114 insertions, 15 deletions
diff --git a/.chezmoiremove b/.chezmoiremove
index c4b76e5..fd1ff69 100644
--- a/.chezmoiremove
+++ b/.chezmoiremove
@@ -8,6 +8,7 @@
 .screenlayout/zeta-work.sh
 bin/mutt
 .config/systemd/user/borgmatic@tosh.service.wants/backup-email@mail.cs.mcgill.ca.service
+.config/systemd/user/default.target.wants/swaybg-random.service
 .config/neomutt/news.rc
 .xkb
 afs
diff --git a/dot_config/sway/config b/dot_config/sway/config
index 562f48a..80c392e 100644
--- a/dot_config/sway/config
+++ b/dot_config/sway/config
@@ -28,10 +28,6 @@ for_window [con_mark=$alphamark] opacity set $trans
 include /etc/sway/config-vars.d/*
 
 ### Idle configuration
-exec swayidle -w \
-         timeout 180 $lock \
-         timeout 240 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-         before-sleep $lock
 for_window [app_id="dspdfviewer"] inhibit_idle focus
 
 ### Input configuration
@@ -196,5 +192,5 @@ exec_always pkill kanshi; exec kanshi
 
 font pango:Iosevka Regular 8
 
-include /etc/sway/config.d/*
+include /etc/sway/config.d/50-systemd-user.conf
 include ~/.config/sway/config.d/*
diff --git a/dot_config/systemd/user/kanshi.service b/dot_config/systemd/user/kanshi.service
new file mode 100644
index 0000000..381b9e4
--- /dev/null
+++ b/dot_config/systemd/user/kanshi.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Dynamic output configuration
+Documentation=man:kanshi(1)
+PartOf=wayland-session.target
+Requires=wayland-session.target
+After=wayland-session.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/kanshi
+Restart=always
+
+[Install]
+WantedBy=wayland-session.target
diff --git a/dot_config/systemd/user/ssh-agent.service.d/override.conf b/dot_config/systemd/user/ssh-agent.service.d/override.conf
index acb0fb7..a3b6435 100644
--- a/dot_config/systemd/user/ssh-agent.service.d/override.conf
+++ b/dot_config/systemd/user/ssh-agent.service.d/override.conf
@@ -1,3 +1,11 @@
+[Unit]
+Description=OpenSSH Agent
+Documentation=man:ssh-agent(1)
+Before=basic.target
+ConditionPathExists=/etc/X11/Xsession.options
+Wants=dbus.socket
+After=dbus.socket
+
 [Service]
 ExecStart=
 ExecStart=/home/rak/.local/lib/openssh/agent-launch start
diff --git a/dot_config/systemd/user/sway-session-pre.target b/dot_config/systemd/user/sway-session-pre.target
new file mode 100644
index 0000000..3215544
--- /dev/null
+++ b/dot_config/systemd/user/sway-session-pre.target
@@ -0,0 +1,18 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is inspired from systemd's `graphical-session-pre.target`
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Session services which should run early before the sway session is brought up
+Documentation=man:systemd.special(7)
+Requires=basic.target
+Before=sway-session.target
+RefuseManualStart=yes
+StopWhenUnneeded=yes
+BindsTo=wayland-session-pre.target
+After=wayland-session-pre.target
diff --git a/dot_config/systemd/user/sway-session.target b/dot_config/systemd/user/sway-session.target
index 56029b8..4637f0f 100644
--- a/dot_config/systemd/user/sway-session.target
+++ b/dot_config/systemd/user/sway-session.target
@@ -1,6 +1,18 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is inspired from systemd's `graphical-session.target`
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
 [Unit]
-Description=Sway session
+Description=Current sway user session
 Documentation=man:systemd.special(7)
-BindsTo=graphical-session.target
-Wants=graphical-session-pre.target
-After=graphical-session-pre.target
+Requires=basic.target
+#RefuseManualStart=yes
+StopWhenUnneeded=yes
+BindsTo=wayland-session.target
+Wants=wayland-session-pre.target
+After=wayland-session-pre.target
diff --git a/dot_config/systemd/user/swaybg-random.service b/dot_config/systemd/user/swaybg-random.service
index 37cd49d..06d7c29 100644
--- a/dot_config/systemd/user/swaybg-random.service
+++ b/dot_config/systemd/user/swaybg-random.service
@@ -1,12 +1,11 @@
 [Unit]
-Description=randomize background
+Description=Randomize Wayland background
 
 [Service]
 Type=exec
 Restart=always
 RuntimeMaxSec=1h
-
 ExecStart=/home/rak/bin/swaybg-random
 
 [Install]
-WantedBy=default.target
+WantedBy=wayland-session.target
diff --git a/dot_config/systemd/user/swayidle.service b/dot_config/systemd/user/swayidle.service
new file mode 100644
index 0000000..536eaf9
--- /dev/null
+++ b/dot_config/systemd/user/swayidle.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Idle manager for Wayland
+Documentation=man:swayidle(1)
+PartOf=wayland-session.target
+Requires=wayland-session.target
+After=wayland-session.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/swayidle -w
+Restart=always
+
+[Install]
+WantedBy=wayland-session.target
diff --git a/dot_config/systemd/user/wayland-session-pre.target b/dot_config/systemd/user/wayland-session-pre.target
new file mode 100644
index 0000000..e4057ed
--- /dev/null
+++ b/dot_config/systemd/user/wayland-session-pre.target
@@ -0,0 +1,18 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is inspired from systemd's `graphical-session-pre.target`
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Session services which should run early before the wayland session is brought up
+Documentation=man:systemd.special(7)
+Requires=basic.target
+Before=wayland-session.target
+RefuseManualStart=yes
+StopWhenUnneeded=yes
+BindsTo=graphical-session-pre.target
+After=graphical-session-pre.target
diff --git a/dot_config/systemd/user/wayland-session.target b/dot_config/systemd/user/wayland-session.target
new file mode 100644
index 0000000..f4cc2b7
--- /dev/null
+++ b/dot_config/systemd/user/wayland-session.target
@@ -0,0 +1,18 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is inspired from systemd's `graphical-session.target`
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Current wayland user session
+Documentation=man:systemd.special(7)
+Requires=basic.target
+RefuseManualStart=yes
+StopWhenUnneeded=yes
+BindsTo=graphical-session.target
+Wants=graphical-session-pre.target
+After=graphical-session-pre.target
diff --git a/dot_config/systemd/user/wayland-session.target.wants/symlink_kanshi.service b/dot_config/systemd/user/wayland-session.target.wants/symlink_kanshi.service
new file mode 100644
index 0000000..7d5903e
--- /dev/null
+++ b/dot_config/systemd/user/wayland-session.target.wants/symlink_kanshi.service
@@ -0,0 +1 @@
+/home/rak/.config/systemd/user/kanshi.service
diff --git a/dot_config/systemd/user/default.target.wants/symlink_swaybg-random.service b/dot_config/systemd/user/wayland-session.target.wants/symlink_swaybg-random.service
index 2ebb1f9..2ebb1f9 100644
--- a/dot_config/systemd/user/default.target.wants/symlink_swaybg-random.service
+++ b/dot_config/systemd/user/wayland-session.target.wants/symlink_swaybg-random.service
diff --git a/dot_config/systemd/user/wayland-session.target.wants/symlink_swayidle.service b/dot_config/systemd/user/wayland-session.target.wants/symlink_swayidle.service
new file mode 100644
index 0000000..a53991f
--- /dev/null
+++ b/dot_config/systemd/user/wayland-session.target.wants/symlink_swayidle.service
@@ -0,0 +1 @@
+/home/rak/.config/systemd/user/swayidle.service
diff --git a/dot_emacs b/dot_emacs
index 6589574..b6d199e 100644
--- a/dot_emacs
+++ b/dot_emacs
@@ -37,7 +37,6 @@
   (user-mail-address "rak@rak.ac")
   (mail-user-agent 'mu4e-user-agent)
   (read-mail-command 'mu4e)
-  (visual-line-fringe-indicators (left-curly-arrow right-curly-arrow))
   :custom-face
   (default ((t (:family "Iosevka")))))
 
@@ -1106,7 +1105,7 @@ If not, issue a warning."
 (use-package simple
   :custom
   (column-mode-number t)
-  (visual-line-fringe-indicators (left-curly-arrow right-curly-arrow)))
+  (visual-line-fringe-indicators '(left-curly-arrow right-curly-arrow)))
 
 (use-package smerge-mode
   :commands smerge-mode
diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
index 2c62630..312ad0e 100644
--- a/dot_zshrc.tmpl
+++ b/dot_zshrc.tmpl
@@ -587,7 +587,7 @@ NO_verbose		\
 # GPG / SSH AGENT
 
 if command -v keychain > /dev/null && test -d ~/.ssh/keys/{{ .chezmoi.hostname }}; then
-    keychain {{ if (eq .chezmoi.os "linux") -}} --systemd {{- end }} --inherit any ~/.ssh/keys/{{ .chezmoi.hostname }}/id_*[^p][^u][^b]
+    keychain --inherit any ~/.ssh/keys/{{ .chezmoi.hostname }}/id_*[^p][^u][^b]
     [ -z "$HOSTNAME" ] && HOSTNAME=`uname -n`
     [ -f $HOME/.keychain/$HOSTNAME-sh ] &&
            . $HOME/.keychain/$HOSTNAME-sh