3 files changed, 7 insertions, 5 deletions
diff --git a/users/tazjin/emacs/config/mail-setup.el b/users/tazjin/emacs/config/mail-setup.el
index 1167bcadd372..7fbece1b102a 100644
--- a/users/tazjin/emacs/config/mail-setup.el
+++ b/users/tazjin/emacs/config/mail-setup.el
@@ -25,8 +25,10 @@
 (setq notmuch-show-empty-saved-searches t)
 
 ;; Mail sending configuration
-(setq send-mail-function 'sendmail-send-it) ;; sendmail provided by MSMTP
-(setq notmuch-always-prompt-for-sender t)
+(setq sendmail-program "gmi") ;; lieer binary supports sendmail emulation
+(setq message-sendmail-extra-arguments
+      '("send" "--quiet" "-t" "-C" "~/mail/account.tazjin"))
+(setq send-mail-function 'sendmail-send-it)
 (setq notmuch-mua-user-agent-function
       (lambda () (format "Emacs %s; notmuch.el %s" emacs-version notmuch-emacs-version)))
 (setq mail-host-address (system-name))
diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix
index 896c7e8c9772..3b0cac643ec7 100644
--- a/users/tazjin/nixos/frog/default.nix
+++ b/users/tazjin/nixos/frog/default.nix
@@ -1,7 +1,7 @@
 { depot, lib, pkgs, ... }:
 
 config: let
-  inherit (depot.third_party) lieer;
+  inherit (pkgs) lieer;
 
   quasselClient = pkgs.quassel.override {
     client = true;
diff --git a/users/tazjin/nixos/tverskoy/default.nix b/users/tazjin/nixos/tverskoy/default.nix
index 8e4593a2ad37..63001da17efe 100644
--- a/users/tazjin/nixos/tverskoy/default.nix
+++ b/users/tazjin/nixos/tverskoy/default.nix
@@ -211,7 +211,6 @@ in lib.fix(self: {
     # programs from the depot
     (with depot; [
       screenLock
-      third_party.lieer
       tools.nsfv-setup
       users.tazjin.emacs
     ]) ++
@@ -238,6 +237,7 @@ in lib.fix(self: {
       iftop
       imagemagick
       jq
+      lieer
       manpages
       mosh
       msmtp
@@ -247,8 +247,8 @@ in lib.fix(self: {
       notmuch
       openssh
       openssl
-      pass
       paperlike-go
+      pass
       pavucontrol
       pinentry
       pinentry-emacs