megamanmalte/nixos
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix(users/malte): drop long-time-broken protonmail mail config

Browse source
This commit is contained in:
Malte Tammena 2023-11-18 11:40:14 +01:00
parent 3520bcadd3
commit 056600f24d
4 changed files with 1 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/notmuch-new.sh
View file

@ -25,7 +25,6 @@ notmuch tag +draft path:'/.*/Drafts/'
notmuch tag +draft path:'/.*/Entw&APw-rfe/'
# Tag all mail according to their accounts
notmuch tag +pm path:'/PM/'
notmuch tag +gmx path:'/GMX/'
notmuch tag +uni path:'/UNI/'
notmuch tag +schulverwalter path:'/schulverwalter/'

1
users/malte/home.nix
View file

@ -61,7 +61,6 @@ in {
./nb.nix
../modules/restic-backup.nix
../modules/synchronize-calendars.nix
../modules/protonmail-bridge.nix
../modules/colors.nix
];

35
users/malte/mail.nix
View file

@ -195,34 +195,8 @@ in {
config = lib.mkIf cfg.enable {
accounts.email.maildirBasePath = "mail";
accounts.email.accounts = {
"PM" = let
extraMailboxes = {
Archive = "Archive";
Drafts = "Drafts";
Sent = "Sent";
Trash = "Trash";
Junk = "Spam";
};
in
emailWithDefaults {
primary = true;
address = deBotify "malte dat tammena ot pm dat me";
imap.host = "127.0.0.1";
imap.port = 1143;
imap.tls.useStartTls = true;
passwordCommand = "${pkgs.coreutils}/bin/cat ~/.config/protonmail/bridge/pw";
smtp = {
host = "127.0.0.1";
port = 1025;
tls.useStartTls = true;
};
msmtp.extraConfig.tls_cert_file = "~/.config/protonmail/bridge/cert.pem";
mbsync.extraConfig.account.CertificateFile = "~/.config/protonmail/bridge/cert.pem";
userName = config.accounts.email.accounts.PM.address;
neomutt.mailboxName = "PM/Inbox";
neomutt.extraMailboxes = scopedMailboxes "PM" extraMailboxes;
};
"UNI" = emailWithDefaults {
primary = true;
address = deBotify "mt85zybu ot studserv dat uni-leipzig dat de";
imap.host = "studserv.uni-leipzig.de";
passwordCommand = getPassword "pw-mail-uni";
@ -416,12 +390,5 @@ in {
xdg.configFile."khard/khard.conf".text = khardConfig;
home.packages = [pkgs.khard];
# Make sure that protonmail-bridge is up before querying it
warnings = lib.optional (!lib.hasAttr "protonmail-bridge" config.systemd.user.services) "No protonmail-bridge service";
systemd.user.services."mbsync".Unit = {
After = ["protonmai-bridge"];
Requires = ["protonmail-bridge"];
};
};
}

34
users/modules/protonmail-bridge.nix
View file

@ -1,34 +0,0 @@
{
pkgs,
lib,
config,
...
}: let
cfg = config.services.protonmailBridge;
in {
options.services.protonmailBridge = with lib; {
enable = mkEnableOption "ProtonMail Bridge application";
};
config = lib.mkIf cfg.enable {
systemd.user.services."protonmail-bridge" = {
Unit = {
Description = "ProtonMail Bridge application";
After = ["network.target"];
};
Service = {
# This is a cheap option to force-unlock the keyring
ExecStartPre = ''
${pkgs.libsecret}/bin/secret-tool store --label='keyring-test' test test
${pkgs.libsecret}/bin/secret-tool clear test test
'';
ExecStart = ''
${pkgs.protonmail-bridge}/bin/protonmail-bridge --no-window --noninteractive --log-level warn
'';
Restart = "always";
RestartSec = "1min";
};
Install.WantedBy = ["default.target"];
};
};
}