diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:36:27 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:38:49 +0000 |
| commit | 1318b9a2f3fc7f7f5dfc3bc8d4a2f243a7306de3 (patch) | |
| tree | 3eb52196349903aa67f500476d9742f1454ca4d2 /modules/workstation/mail | |
| parent | 5c1ec7dafe98edd151c58e90bafa26abf1ee74fb (diff) | |
| download | nixlib-1318b9a2f3fc7f7f5dfc3bc8d4a2f243a7306de3.tar nixlib-1318b9a2f3fc7f7f5dfc3bc8d4a2f243a7306de3.tar.gz nixlib-1318b9a2f3fc7f7f5dfc3bc8d4a2f243a7306de3.tar.bz2 nixlib-1318b9a2f3fc7f7f5dfc3bc8d4a2f243a7306de3.tar.lz nixlib-1318b9a2f3fc7f7f5dfc3bc8d4a2f243a7306de3.tar.xz nixlib-1318b9a2f3fc7f7f5dfc3bc8d4a2f243a7306de3.tar.zst nixlib-1318b9a2f3fc7f7f5dfc3bc8d4a2f243a7306de3.zip | |
modules/mail: fix receiving and sending
Diffstat (limited to 'modules/workstation/mail')
| -rw-r--r-- | modules/workstation/mail/isync/default.nix | 6 | ||||
| -rw-r--r-- | modules/workstation/mail/msmtp/default.nix | 8 | ||||
| -rw-r--r-- | modules/workstation/mail/msmtp/msmtprc.in (renamed from modules/workstation/mail/msmtp/msmtprc.nix) | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/modules/workstation/mail/isync/default.nix b/modules/workstation/mail/isync/default.nix index 326a3bc31ec8..3fcd2c6f8b35 100644 --- a/modules/workstation/mail/isync/default.nix +++ b/modules/workstation/mail/isync/default.nix @@ -18,8 +18,10 @@ postStart = '' ${findutils}/bin/find \ "${maildir}" \ - -not -name .mbsyncstate \ - -exec ${coreutils}/bin/chown qyliss:qyliss '{}' \; + -type f \ + -not -name .mbsyncstate* \ + -exec ${coreutils}/bin/chown qyliss:qyliss '{}' \; \ + -exec ${coreutils}/bin/chmod 0660 '{}' \; ''; }; diff --git a/modules/workstation/mail/msmtp/default.nix b/modules/workstation/mail/msmtp/default.nix index e6dbaaa5ba86..1648020c0633 100644 --- a/modules/workstation/mail/msmtp/default.nix +++ b/modules/workstation/mail/msmtp/default.nix @@ -5,6 +5,10 @@ home.qyliss.dirs."state/msmtp" = {}; - xdg.config.users.qyliss.paths."msmtp/config" = - with pkgs; writeText "msmtprc" (callPackage ./msmtprc.nix {}); + xdg.config.users.qyliss.paths."msmtp/config" = pkgs.runCommand "msmtprc" { + inherit (pkgs) gnupg; + tls_trust_file = "/etc/ssl/certs/ca-bundle.crt"; + } '' + substituteAll ${./msmtprc.in} $out + ''; } diff --git a/modules/workstation/mail/msmtp/msmtprc.nix b/modules/workstation/mail/msmtp/msmtprc.in index f4caa74565d7..e638a453bad7 100644 --- a/modules/workstation/mail/msmtp/msmtprc.nix +++ b/modules/workstation/mail/msmtp/msmtprc.in @@ -1,12 +1,7 @@ -{ stdenv, gnupg }: - -'' defaults auth on tls on -tls_trust_file ${if stdenv.isDarwin - then /etc/ssl/cert.pem - else /etc/ssl/certs/ca-bundle.crt} +tls_trust_file @tls_trust_file@ account work host smtp.gmail.com @@ -20,5 +15,4 @@ port 465 tls_starttls off from hi@alyssa.is user alyssa@fastmail.com -passwordeval ${gnupg}/bin/gpg --no-tty -q -d ~/state/msmtp/smtppass.gpg -'' +passwordeval @gnupg@/bin/gpg --no-tty -q -d ~/state/msmtp/smtppass.gpg |