fixes

3 files changed, 10 insertions, 6 deletions

diff --git a/desktop/.config/sway/config b/desktop/.config/sway/config
index bddf39b..af20fde 100755
--- a/desktop/.config/sway/config
+++ b/desktop/.config/sway/config
@@ -26,7 +26,6 @@ include /etc/sway/config-vars.d/*
 ### Output configuration
 #
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 #
 # Example configuration:
 #
@@ -221,7 +220,7 @@ input 1:1:AT_Translated_Set_2_keyboard {
 
 include /etc/sway/config.d/*
 
-exec "ssh-agent -a $SSH_AUTH_SOCK"
+exec "[[ -e $SSH_AUTH_SOCK ]] || ssh-agent -a $SSH_AUTH_SOCK"
 exec nm-applet --indicator
 exec dunst
 exec kanshi -c ~/.config/kanshi/config
diff --git a/emacs/.config/emacs-kj/lisp/kj-email.el b/emacs/.config/emacs-kj/lisp/kj-email.el
index 6acf3b8..0d4cd40 100644
--- a/emacs/.config/emacs-kj/lisp/kj-email.el
+++ b/emacs/.config/emacs-kj/lisp/kj-email.el
@@ -3,22 +3,26 @@
 (setq kj/fastmail-maildir (expand-file-name "~/Maildir/fastmail"))
 
 (when (file-exists-p (expand-file-name "~/Maildir"))
+  (with-eval-after-load 'message
+    (setq message-mail-user-agent 'notmuch-user-agent
+          message-cite-style 'message-cite-style-thunderbird
+          message-citation-line-function 'message-insert-formatted-citation-line
+          message-kill-buffer-on-exit t)
+    (add-hook 'message-mode-hook 'turn-off-auto-fill)
+    (add-hook 'message-mode-hook 'visual-line-mode))
   (use-package notmuch
     :config
 
-    (setq message-mail-user-agent 'notmuch-user-agent
-          message-kill-buffer-on-exit t)
     (setq notmuch-show-all-tags-list t
           notmuch-show-relative-dates t
           notmuch-hello-tag-list-make-query "tag:unread"
           notmuch-archive-tags '("-inbox" "-unread")
           notmuch-fcc-dirs nil
           notmuch-show-logo nil
+          notmuch-mua-cite-function 'message-cite-original-without-signature
           notmuch-wash-citation-lines-prefix most-positive-fixnum
           notmuch-wash-citation-lines-suffix most-positive-fixnum
           notmuch-show-indent-messages-width 0)
-    (add-hook 'message-mode-hook 'turn-off-auto-fill)
-    (add-hook 'message-mode-hook 'visual-line-mode)
     (add-hook 'notmuch-show-hook 'kj/disable-trailing-whitespace)
 
     (defun kj/confirm-empty-subject ()
diff --git a/email/.config/systemd/user/mujmap.service b/email/.config/systemd/user/mujmap.service
index 3a84902..aa27107 100644
--- a/email/.config/systemd/user/mujmap.service
+++ b/email/.config/systemd/user/mujmap.service
@@ -1,5 +1,6 @@
 [Service]
 Type=oneshot
+Environment=PATH=/run/current-system/sw/bin
 ExecStart=/run/current-system/sw/bin/mujmap -C /home/orbekk/Maildir/fastmail sync
 
 [Unit]