2024-08-03

6 files changed, 36 insertions, 25 deletions

diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
index 3e59ce8..1e575ed 100644
--- a/modules/emacs/default.nix
+++ b/modules/emacs/default.nix
@@ -227,6 +227,10 @@ in
                               (mu4e-drafts-folder       . "/${name}/${folders.drafts}")
                               (mu4e-trash-folder        . "/${name}/${folders.trash}")
                               (mu4e-refile-folder       . "/${name}/Archive")
+                              ${
+                                optionalString (signature.showSignature != "none")
+                                  ''(mu4e-compose-signature   . "${replaceStrings [ "\n" ] [ "\\n" ] signature.text}")''
+                              }
                               (+mu4e-personal-addresses . (${personalAddresses})))
                             t)
                         ''
diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el
index 1926627..51d1c47 100644
--- a/modules/emacs/doom/config.el
+++ b/modules/emacs/doom/config.el
@@ -196,13 +196,14 @@
 ;;; mu4e
 ;;
 
-(setq-hook! 'mu4e-main-mode-hook
-  mu4e-update-interval 30
-  message-send-mail-function #'message-send-mail-with-sendmail
-  message-sendmail-extra-arguments '("--read-envelope-from")
-  message-sendmail-f-is-evil t
-  send-mail-function #'sendmail-send-it
-  sendmail-program (executable-find "msmtp"))
+(after! mu4e
+  (setq sendmail-program (executable-find "msmtp")
+        send-mail-function #'smtpmail-send-it
+        message-sendmail-f-is-evil t
+        message-sendmail-extra-arguments '("--read-envelope-from")
+        message-send-mail-function #'message-send-mail-with-sendmail))
+
+(setq-hook! 'mu4e-main-mode-hook mu4e-update-interval 30)
 
 ;;
 ;;; Circe
diff --git a/modules/emacs/doom/init.el b/modules/emacs/doom/init.el
index 8b04fa7..5788fcc 100644
--- a/modules/emacs/doom/init.el
+++ b/modules/emacs/doom/init.el
@@ -68,14 +68,11 @@
        :lang
        (cc +lsp +tree-sitter)
        data
-       dhall
        emacs-lisp
        (go +lsp +tree-sitter)
        (haskell +lsp +tree-sitter)
-       java
        javascript
        (json +lsp +tree-sitter)
-       kotlin
        (latex +latexmk +cdlatex +lsp)
        markdown
        (nix +lsp +tree-sitter)
diff --git a/modules/firefox/default.nix b/modules/firefox/default.nix
index b05443b..d51bd66 100644
--- a/modules/firefox/default.nix
+++ b/modules/firefox/default.nix
@@ -143,7 +143,7 @@ in
               default = "DuckDuckGo";
               order = [
                 "DuckDuckGo"
-                "Yahoo"
+                "Yandex"
                 "Google"
               ];
 
@@ -398,11 +398,11 @@ in
                     ];
                   };
 
-                  "Yahoo" = {
-                    urls = [ { template = "https://yahoo.com/search/?text={searchTerms}"; } ];
-                    icon = getIcon "https://yahoostatic.net/s3/web4static/_/v2/oxjfXL1EO-B5Arm80ZrL00p0al4.png" "sha256-gvYh4oCZEO7BL2QZ6QvQFlmFiP2L4SLJrxAsKFcG6G4=";
+                  "Yandex" = {
+                    urls = [ { template = "https://yandex.ru/search/?text={searchTerms}"; } ];
+                    icon = getIcon "https://yastatic.net/s3/web4static/_/v2/oxjfXL1EO-B5Arm80ZrL00p0al4.png" "sha256-gvYh4oCZEO7BL2QZ6QvQFlmFiP2L4SLJrxAsKFcG6G4=";
                     definedAliases = [
-                      "@yahoo"
+                      "@yandex"
                       "@ya"
                     ];
                   };
diff --git a/modules/profiles/email.nix b/modules/profiles/email.nix
index b2ef02f..5dd4712 100644
--- a/modules/profiles/email.nix
+++ b/modules/profiles/email.nix
@@ -75,6 +75,15 @@ in
                 "azahi@shire.net"
               ];
               realName = my.fullname;
+              signature = {
+                showSignature = "append";
+                text = ''
+                  Firstname Lastname | Firstname Lastname | https://azahi.cc/
+
+                  Please consider using plain text when replying!
+                    >> https://useplaintext.email/#etiquette <<
+                '';
+              };
               gpg = {
                 inherit (my.pgp) key;
                 signByDefault = false;
@@ -97,18 +106,18 @@ in
               passwordCommand = getPassword { path = "email/shire.net/azahi"; };
             };
 
-            yahoo = mkAccount rec {
-              address = "admin@yahoo.com";
+            yandex = mkAccount rec {
+              address = "username@ya.ru";
               aliases = [
                 address
-                "admin@yahoo.com"
+                "username@yandex.ru"
               ];
               realName = "Firstname Lastname";
 
-              flavor = "yahoo.com";
-              userName = "admin@yahoo.com";
+              flavor = "yandex.com";
+              userName = "username@yandex.ru";
               passwordCommand = getPassword {
-                path = "email/yahoo.com/admin";
+                path = "email/yandex.ru/username";
                 line = 2;
               };
             };
diff --git a/modules/qutebrowser.nix b/modules/qutebrowser.nix
index 36a71e7..6ba7c07 100644
--- a/modules/qutebrowser.nix
+++ b/modules/qutebrowser.nix
@@ -84,9 +84,9 @@ in
           wikipedia-ru = "https://ru.wikipedia.org/w/index.php?search={}";
           wikipedia-ja = "https://ja.wikipedia.org/w/index.php?search={}";
           wolphramalpha = "https://www.wolframalpha.com/input/?i={}";
-          yahoo = "https://yahoo.com/search/?text={}";
-          yahoo-images = "https://yahoo.com/images/search?text={}";
-          yahoo-market = "https://market.yahoo.com/search?text={}";
+          yandex = "https://yandex.ru/search/?text={}";
+          yandex-images = "https://yandex.ru/images/search?text={}";
+          yandex-market = "https://market.yandex.ru/search?text={}";
           youtube = "https://yewtu.be/search?q={}";
 
           aw = arch;
@@ -110,7 +110,7 @@ in
           wen = wikipedia-en;
           wja = wikipedia-ja;
           wru = wikipedia-ru;
-          y = yahoo;
+          y = yandex;
           yt = youtube;
         };