From 289eac0a1de37ade29fd2b4cc579111906705419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sun, 20 Feb 2022 14:40:37 +0000
Subject: [PATCH] email config

---
 flake.lock               | 30 +++++++++++++--------------
 nixos/email-accounts.nix | 44 ++++++++++++++++++++++++++--------------
 nixos/gui/vscode.nix     |  2 +-
 3 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/flake.lock b/flake.lock
index adfe5e87..b5fab066 100644
--- a/flake.lock
+++ b/flake.lock
@@ -110,11 +110,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1643980037,
-        "narHash": "sha256-RdVHt2mD408WXMjQIOLvUzy8cSUHu8NAbilDmPVxf7E=",
+        "lastModified": 1644870092,
+        "narHash": "sha256-RLPD92lqXW98LDIbbwYqwAbt3R4iD1V1PiylfgBq5cU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "9886a06e4745edb31587d0e9481ad82d35f0d593",
+        "rev": "10eab1c4cd8e715c0b41d32c28af2b89fc67bed0",
         "type": "github"
       },
       "original": {
@@ -139,11 +139,11 @@
     },
     "nixpkgs-nixos-unstable": {
       "locked": {
-        "lastModified": 1644420267,
-        "narHash": "sha256-rFJuctggkjM412OC6OGPdXogFp7czGDW05ueWqpJbj8=",
+        "lastModified": 1644525281,
+        "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "98bb5b77c8c6666824a4c13d23befa1e07210ef1",
+        "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2",
         "type": "github"
       },
       "original": {
@@ -155,11 +155,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1644193793,
-        "narHash": "sha256-ggCI5LCXwkUJQwjpkr9qDFbQMiK3JvAfeNR4Uy0ny5Q=",
+        "lastModified": 1645010845,
+        "narHash": "sha256-hO9X4PvxkSLMQnGGB7tOrKPwufhLMiNQMNXNwzLqneo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "521e4d7d13b09bc0a21976b9d19abd197d4e3b1e",
+        "rev": "2128d0aa28edef51fd8fef38b132ffc0155595df",
         "type": "github"
       },
       "original": {
@@ -203,11 +203,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1644512748,
-        "narHash": "sha256-aYdju/AKv1VJ7ucUvCY7+g16/ADN2jdxA1gNeOuT+PM=",
+        "lastModified": 1645271045,
+        "narHash": "sha256-roWSAmjwU6B/2gYmphvSqGQOrQD0Cd6bOYJJFqwEkbA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d14d74f02fc968242ca91bb1b05b719caa5a1288",
+        "rev": "a331ed9fb29bdb39d089d036fb0cf0a4d0bf06cb",
         "type": "github"
       },
       "original": {
@@ -235,11 +235,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1644240878,
-        "narHash": "sha256-JO5WrnP6+5qN3isdmm9VmjzvCM64UElgGnql7vEGjKU=",
+        "lastModified": 1644599065,
+        "narHash": "sha256-oFLRb9p954wiUGn8iU5wOCY/7yBrT4Xvg7Ew07MvSKs=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "95b4393147dba5660bf0d13544ef5ef49d646f89",
+        "rev": "fc22eff3205e9742c1b0fd229c267bf237f0c43e",
         "type": "github"
       },
       "original": {
diff --git a/nixos/email-accounts.nix b/nixos/email-accounts.nix
index 2ad90deb..f76154d5 100644
--- a/nixos/email-accounts.nix
+++ b/nixos/email-accounts.nix
@@ -14,23 +14,36 @@ in
         host = "127.0.0.1";
         port = 1143;
         tls = {
-          enable = false;
-          useStartTls = false;
+          enable = true;
+          useStartTls = true;
+          certificatesFile = "/home/cyryl/.config/protonmail/bridge/cert.pem";
         };
       };
       smtp = {
         host = "127.0.0.1";
         port = 1025;
         tls = {
-          enable = false;
-          useStartTls = false;
+          enable = true;
+          useStartTls = true;
+          certificatesFile = "/home/cyryl/.config/protonmail/bridge/cert.pem";
+        };
+      };
+      mbsync = {
+        enable = true;
+        create = "maildir";
+        expunge = "maildir";
+        remove = "maildir";
+      };
+      msmtp = {
+        enable = true;
+        extraConfig = {
+          from = "cyplo@cyplo.dev";
+          auth = "plain";
         };
       };
       notmuch.enable = true;
-      himalaya.enable = true;
-      msmtp.enable = true;
+      neomutt.enable = true;
       passwordCommand = "${pkgs.pass}/bin/pass proton-bridge";
-      offlineimap.enable = true;
       folders = {
         drafts = "Drafts";
         inbox = "INBOX";
@@ -39,29 +52,30 @@ in
       };
     };
 
+    programs.mbsync.enable = true;
     programs.msmtp.enable = true;
-    programs.offlineimap.enable = true;
+    programs.neomutt = {
+      enable = true;
+    };
     programs.notmuch = {
       enable = true;
-      hooks.preNew = "${pkgs.offlineimap}/bin/offlineimap -o";
+      hooks.preNew = "${pkgs.isync}/bin/mbsync -a";
     };
     programs.alot = {
       enable = true;
     };
 
-    programs.himalaya = {
-      enable = true;
-      package = unstable.himalaya;
-    };
-
     home.packages = with pkgs; [
       unstable.protonmail-bridge
     ];
 
+    services.mbsync.enable = true;
+
     systemd.user.services."proton-bridge" = {
       Unit.Description = "Bridge to ProtonMail";
-      Install.WantedBy = [ "default.target" ];
+      Install.WantedBy = [ "default.target" "mbsync.service" ];
       Service.ExecStart = "${unstable.protonmail-bridge}/bin/protonmail-bridge --noninteractive";
+      Service.Environment = "PATH=${pkgs.pass}/bin:${pkgs.gnupg}/bin";
     };
 
   };
diff --git a/nixos/gui/vscode.nix b/nixos/gui/vscode.nix
index 7176618e..a0ec4ad4 100644
--- a/nixos/gui/vscode.nix
+++ b/nixos/gui/vscode.nix
@@ -37,7 +37,7 @@
           publisher = "matklad";
           name = "rust-analyzer";
           version = "0.3.937";
-          sha256 = "sha256-VxPxNt0s4PvoPNkJm166uaW7KzC8Q7PFMvHhP5tQboo=";
+          sha256 = "sha256-aGBFKnntycpgNFdWwxFPVtQ2ryUvFCx7oet9uILiUTY=";
         }
         {
           publisher = "be5invis";