diff --git a/_config.xdg.dataHome/neomutt/cache/headers b/_config.xdg.dataHome/neomutt/cache/headers deleted file mode 100644 index dbcc25e..0000000 Binary files a/_config.xdg.dataHome/neomutt/cache/headers and /dev/null differ diff --git a/_config.xdg.dataHome/neomutt/cache/headers-lock b/_config.xdg.dataHome/neomutt/cache/headers-lock deleted file mode 100644 index 5bcc15e..0000000 Binary files a/_config.xdg.dataHome/neomutt/cache/headers-lock and /dev/null differ diff --git a/home/mail/bindings.neomuttrc b/home/mail/bindings.neomuttrc index 1667a89..6ec0d01 100644 --- a/home/mail/bindings.neomuttrc +++ b/home/mail/bindings.neomuttrc @@ -1,13 +1,14 @@ # Navigation -bind index,pager k previous-entry -bind index,pager j next-entry -bind index,pager \Cu half-up -bind index,pager \Cd half-down -bind pager gg top -bind index gg first-entry -bind pager G bottom -bind index G last-entry -bind index,pager N search-opposite +bind pager k previous-entry +bind pager j next-entry +# bind index,pager \Cu half-up +# bind index,pager \Cd half-down +# bind pager gg top +# bind index gg first-entry +# bind pager G bottom +# bind index G last-entry +# bind index,pager N search-opposite +bind index display-message bind index collapse-thread bind index,pager gf change-folder @@ -15,14 +16,6 @@ bind index,pager gf change-folder bind index,pager V noop macro index,pager V "html" -# Sidebar navigation -# bind index,pager \Cj sidebar-next -# bind index,pager \Ck sidebar-prev -# bind index,pager \Cl sidebar-open -# bind index,pager gl sidebar-toggle-visible - -# macro index,pager g8 "less" "Just testing" - # compose bind compose p postpone-message bind compose P pgp-menu @@ -49,28 +42,28 @@ macro index,pager y ":set resolve=no\nn:set resolve=yes\n$spoolfile" "Move message to the inbox" # switch folders -# macro index,pager gi "$spoolfile" "Go to inbox" macro index,pager g! "$spoolfile" "Go to inbox" macro index,pager gd "$postponed" "Go to drafts" -# macro index,pager gs "$record" "Go to sent" macro index,pager g< "$record" "Go to sent" -# macro index,pager ga "$mbox" "Go to archive" +macro index,pager ga "$mbox" "Go to archive" macro index,pager g> "$mbox" "Go to archive" macro index,pager gt "$trash" "Go to trash" macro index,pager gj "$my_junk" "Go to junk" # accounts -macro index,pager gu "+gu/IMAP/Inbox" "Go to GU" -macro index,pager gp "+systemli/IMAP/Inbox" "Go to Systemli" -macro index,pager gm "+gmail/IMAP/Inbox" "Go to Gmail" -macro index,pager gk "+ks/IMAP/Inbox" "Go to KS" -macro index,pager gi "+ktiu/IMAP/Inbox" "Go to ktiu" -macro index,pager gf "+dkg/IMAP/Inbox" "Go to DKG" +macro index,pager gu "~/.local/share/mail/imap/gu/Inbox" "Go to GU" +# macro index,pager gp "+systemli/IMAP/Inbox" "Go to Systemli" +# macro index,pager gm "+gmail/IMAP/Inbox" "Go to Gmail" +# macro index,pager gk "+ks/IMAP/Inbox" "Go to KS" +macro index,pager gi "~/.local/share/mail/imap/ktiu/Inbox" "Go to ktiu" +# macro index,pager gf "+dkg/IMAP/Inbox" "Go to DKG" macro index,pager L "all\n" "Show all messages (undo limit)" -macro index,pager go "mbsync -c ~/.config/mbsync/mbsyncrc $my_mbsync_acct && notmuch new" \ - "Run mbsync to sync mail for this account" +# macro index,pager go "mbsync -c ~/.config/mbsync/mbsyncrc $my_mbsync_acct && notmuch new" \ +# "Run mbsync to sync mail for this account" + +macro index,pager go "mbsync $my_mbsync_acct && notmuch new" \ macro index,pager g/ \ "" \ diff --git a/home/mail/config.neomuttrc b/home/mail/config.neomuttrc index 78ea42f..fa13f24 100644 --- a/home/mail/config.neomuttrc +++ b/home/mail/config.neomuttrc @@ -1,8 +1,9 @@ -# set mailcap_path = ~/.config/neomutt/mailcap -# set tmpdir = ~/.local/share/neomutt/tmp set alias_file = ~/.local/share/neomutt/aliases.neomuttrc +source $alias_file + +source ./smime.neomuttrc + set my_download_folder = ~/tmp -set folder = ~/.local/share/mail/imap/ # Caching set header_cache = ~/.local/share/neomutt/cache/headers @@ -21,7 +22,6 @@ set sleep_time = 0 # set shell = /bin/bash # Sending -# set sendmail = "/home/till/.nix-profile/bin/sendmail -C /home/till/.config/msmtp/msmtprc" set use_envelope_from unset reverse_realname @@ -40,8 +40,8 @@ unset reverse_realname # folder-hook $folder/ktiu/ source ~/.config/neomutt/accounts/ktiu.neomuttrc # folder-hook $folder/dkg/ source ~/.config/neomutt/accounts/dkg.neomuttrc # folder-hook $folder/papa/ source ~/.config/neomutt/accounts/papa.neomuttrc -# folder-hook . source ~/.config/neomutt/bindings.neomuttrc +folder-hook . source ~/.config/neomutt/bindings.neomuttrc # # Source config # source ~/.config/neomutt/views.neomuttrc @@ -49,7 +49,6 @@ unset reverse_realname # source ~/.config/neomutt/colors.neomuttrc # source ~/.config/neomutt/smime.neomuttrc # source ~/.config/neomutt/pgp.neomuttrc -source $alias_file # Compose set editor = "nvim -c 'call woof#init#Init()'" @@ -117,11 +116,11 @@ color header yellow default "^(From|To|CC|BCC)" color header blue default "^Date" ## Status -color status yellow default '\[ ↻ \]' -color status green default '\[ ✔ \]' -color status magenta default '\[ ٪ \]' -color status black default '\[ [0-9]+ new \]' -color status red default '\[ [0-9]+ to delete \]' +# color status yellow default '\[ ↻ \]' +# color status green default '\[ ✔ \]' +# color status magenta default '\[ ٪ \]' +# color status black default '\[ [0-9]+ new \]' +# color status red default '\[ [0-9]+ to delete \]' ## Mutt color message cyan default diff --git a/home/mail/default.nix b/home/mail/default.nix index b1ccd0d..f32a7ba 100644 --- a/home/mail/default.nix +++ b/home/mail/default.nix @@ -6,43 +6,21 @@ programs.neomutt = { enable = true; vimKeys = true; - ]; - sort = "reverse-threads"; - changeFolderWhenSourcingAccount = false; - extraConfig = builtins.readFile ./config.neomttrc; + extraConfig = builtins.readFile ./config.neomuttrc; }; xdg.configFile."neomutt/bindings.neomuttrc".source = ./bindings.neomuttrc; + xdg.configFile."neomutt/smime.neomuttrc".source = ./smime.neomuttrc; accounts.email = { maildirBasePath = "${config.xdg.dataHome}/mail/imap"; accounts = { - ktiu = { - primary = true; - address = "till@ktiu.net"; - realName = "Till Straube"; - imap.host = "shorbut.ktiu.net"; - smtp.host = "shorbut.ktiu.net"; - userName = "till"; - signature.text = '' - Till Straube - ''; - signature.showSignature = "append"; - neomutt.enable = true; - neomutt.extraConfig = '' - unalternates * - alternates @ktiu.net$ - set reverse_name - # set my_signature = {signature} - color status yellow default - ''; - mbsync.enable = true; - msmtp.enable = true; - passwordCommand = "secret-tool lookup server shorbut.ktiu.net account till"; - }; gu = { + primary = true; address = "straube@geo.uni-frankfurt.de"; realName = "Till Straube"; imap.host = "imap.server.uni-frankfurt.de"; smtp.host = "smtpauth.rz.uni-frankfurt.de"; + smtp.tls.useStartTls = true; + passwordCommand = "secret-tool lookup server uni-frankfurt.de account tstraube"; userName = "tstraube"; signature = { text = '' @@ -50,20 +28,67 @@ ''; showSignature = "append"; }; - neomutt.enable = true; - neomutt.extraConfig = '' - unalternates * - alternates ^straube@em.uni-frankfurt.de$ \ - ^tstraube@em.uni-frankfurt.de$ \ - ^tstraube@rz.uni-frankfurt.de$ \ - ^tstraube@uni-frankfurt.de$ - unset reverse_name - # set my_signature = {signature} - color status blue default + neomutt = { + enable = true; + sendMailCommand = "/home/till/.nix-profile/bin/msmtp"; + extraConfig = '' + set mbox='+Archive' + set my_junk='+Spamverdacht' + set my_mbsync_acct='gu' + + set crypt_autosign + set crypt_replyencrypt + set crypt_replysign + set crypt_replysignencrypted + set crypt_verify_sig + set smime_is_default + set smime_default_key = "f1355556.0" + set pgp_default_key = "" + + unalternates * + alternates ^straube@em.uni-frankfurt.de$ \ + ^tstraube@em.uni-frankfurt.de$ \ + ^tstraube@rz.uni-frankfurt.de$ \ + ^tstraube@uni-frankfurt.de$ + unset reverse_name + # set my_signature = {signature} + color status blue default + ''; + }; + mbsync.enable = true; + msmtp = { + enable = true; + # extraConfig = { + # tls_starttls = "on"; + # }; + }; + }; + ktiu = { + address = "till@ktiu.net"; + realName = "Till Straube"; + imap.host = "shorbut.ktiu.net"; + smtp.host = "shorbut.ktiu.net"; + smtp.tls.useStartTls = true; + userName = "till"; + signature.text = '' + Till Straube ''; + signature.showSignature = "append"; + neomutt = { + enable = true; + sendMailCommand = "/home/till/.nix-profile/bin/msmtp"; + extraConfig = '' + set my_mbsync_acct='ktiu' + unalternates * + alternates @ktiu.net$ + set reverse_name + # set my_signature = {signature} + color status yellow default + ''; + }; mbsync.enable = true; msmtp.enable = true; - passwordCommand = "secret-tool lookup server imap.server.uni-frankfurt.de account tstraube"; + passwordCommand = "secret-tool lookup server shorbut.ktiu.net account till"; }; }; }; diff --git a/home/mail/smime.neomuttrc b/home/mail/smime.neomuttrc new file mode 100644 index 0000000..15da302 --- /dev/null +++ b/home/mail/smime.neomuttrc @@ -0,0 +1,27 @@ +# Use SMIME +unset crypt_use_gpgme + +# Locations +set smime_ca_location="~/.keys/neomutt/smime/ca" +set smime_certificates="~/.keys/neomutt/smime/public" +set smime_keys="~/.keys/neomutt/smime/private" + +# Commands (smime_keys) +set smime_pk7out_command="openssl smime -verify -in %f -noverify -pk7out" +set smime_get_cert_command="openssl pkcs7 -print_certs -in %f" +set smime_get_signer_cert_command="openssl smime -verify -in %f -noverify -signer %c -out /dev/null" +set smime_get_cert_email_command="openssl x509 -in %f -noout -email" +set smime_import_cert_command="smime_keys add_cert %f" + +# Outgoing +set smime_encrypt_with="aes256" +set smime_encrypt_command="openssl smime -encrypt -%a -outform DER -in %f %c" +set smime_sign_digest_alg="sha256" +set smime_sign_command="openssl smime -sign -md %d -signer %c -inkey %k -passin stdin -in %f -certfile %i -outform DER" + +# Incoming +set smime_decrypt_command="openssl smime -decrypt -passin stdin -inform DER -in %f -inkey %k -recip %c" +set smime_verify_command="openssl smime -verify -inform DER -in %s %C -content %f" +set smime_verify_opaque_command="\ +openssl smime -verify -inform DER -in %s %C || \ +openssl smime -verify -inform DER -in %s -noverify 2>/dev/null" diff --git a/texput.log b/texput.log deleted file mode 100644 index 92b9854..0000000 --- a/texput.log +++ /dev/null @@ -1,9 +0,0 @@ -This is TeX, Version 3.141592653 (TeX Live 2021/nixos.org) (preloaded format=tex 1980.1.1) 16 MAY 2023 14:34 -**sourcesanspro.sty - -! Emergency stop. -<*> sourcesanspro.sty - -End of file on the terminal! - -No pages of output.