From 24bd9bfa4674f4741045201f0a18aac1f5825af7 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 27 Dec 2020 19:09:49 +0100 Subject: [PATCH] Update dependencies --- configurations/mail.nix | 19 ++----------------- flake.lock | 12 ++++++------ 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/configurations/mail.nix b/configurations/mail.nix index dad65a40..d132e2d1 100644 --- a/configurations/mail.nix +++ b/configurations/mail.nix @@ -27,7 +27,7 @@ let enable = true; boxes = [ "INBOX" ]; onNotify = "${pkgs.offlineimap}/bin/offlineimap -a ${name} -f INBOX"; - onNotifyPost = { mail = "${notifyScript name}"; }; + onNotifyPost = "${notifyScript name}"; }; msmtp.enable = true; neomutt = { @@ -51,19 +51,6 @@ let userName = address; } extraConfig); - genNotifyImapPatch = account: { - name = "imapnotify-${account}"; - value = { - Unit = { - After = "network-online.target"; - Wants = "network-online.target"; - }; - Service = { - Restart = "always"; - RestartSec = 20; - }; - }; - }; toRecursiveINI = with lib.strings; with lib.attrsets; with lib.generators; with lib.lists; let repeat = count: char: concatStrings (genList (_: char) count); mkHeader = depth: name: concatStrings [ (repeat depth "[") (escape [ "[" ] name) (repeat depth "]") ]; @@ -163,8 +150,6 @@ in sent = "[Gmail].Sent Mail"; trash = "[Gmail].Bin"; }; - # IMAPNotify doesn't seem to work for imap.gmail.com. - imapnotify.enable = false; }; }; postbot = makeAccount { @@ -316,7 +301,7 @@ in }; Service = { ExecStart = "${pkgs.vdirsyncer}/bin/vdirsyncer sync"; }; }; - } // lib.listToAttrs (map genNotifyImapPatch [ "personal" "postbot" "posteo" "webmaster" "work" ]); + }; timers = { offlineimap = { Unit = { Description = "OfflineIMAP email fetcher"; }; diff --git a/flake.lock b/flake.lock index f2a50dd1..ee37b980 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1608969323, - "narHash": "sha256-qhRvX4Z2CB8Qp4EUFRh1KLiyIwsM3njpJG43CsbNAkY=", + "lastModified": 1609081855, + "narHash": "sha256-wxTOLR1BSMojbJ8N2pIsaf6+AD4WZNeCSP34OKiJfvE=", "owner": "nix-community", "repo": "home-manager", - "rev": "bcbf09a2021712a501681fa984f659fddad3c2e8", + "rev": "5263fe459413a411e51355bfae5b5673b481dbe3", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1609033108, - "narHash": "sha256-O4cgB3Qe+/jzCQ1NkNakoXao0m6+ZWA5kDYROYIIxzk=", + "lastModified": 1609077552, + "narHash": "sha256-8DGeu+Nu7P79AE+yGLwXc+AeJusIVGg77PxlA5xUjDs=", "owner": "charvp", "repo": "nixpkgs", - "rev": "9c304aa09649e6ccbbd58d6a4bf6da8a29e84304", + "rev": "c958c1b6b2f94f2d1e45809cf4097aa72439130a", "type": "github" }, "original": {