From b0d086a0e764d1b1a2a5bead2a81bfb9030f19fa Mon Sep 17 00:00:00 2001
From: Christoph Schmatzler <christoph@schmatzler.com>
Date: Sun, 1 Mar 2026 18:29:41 +0000
Subject: [PATCH] set up neverest imap-to-maildir sync, switch himalaya to
 maildir backend

---
 hosts/tahani/default.nix |  1 +
 profiles/himalaya.nix    | 12 +++++++-----
 profiles/neverest.nix    |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/hosts/tahani/default.nix b/hosts/tahani/default.nix
index 530c363..b5fed31 100644
--- a/hosts/tahani/default.nix
+++ b/hosts/tahani/default.nix
@@ -30,6 +30,7 @@
 			../../profiles/fzf.nix
 			../../profiles/git.nix
 			../../profiles/himalaya.nix
+			../../profiles/neverest.nix
 			../../profiles/home.nix
 			../../profiles/jjui.nix
 			../../profiles/jujutsu.nix
diff --git a/profiles/himalaya.nix b/profiles/himalaya.nix
index a2518eb..e942c87 100644
--- a/profiles/himalaya.nix
+++ b/profiles/himalaya.nix
@@ -11,16 +11,18 @@
 	};
 
 	accounts.email = {
-		accounts.icloud = {
+		accounts."christoph@schmatzler.com" = {
 			primary = true;
+			maildir.path = "christoph@schmatzler.com";
 			address = "christoph@schmatzler.com";
 			userName = "christoph.schmatzler@icloud.com";
 			realName = "Christoph Schmatzler";
 			passwordCommand = ["cat" "/run/secrets/tahani-email-password"];
-			imap = {
-				host = "imap.mail.me.com";
-				port = 993;
-				tls.enable = true;
+			folders = {
+				inbox = "INBOX";
+				drafts = "Drafts";
+				sent = "Sent Messages";
+				trash = "Deleted Messages";
 			};
 			smtp = {
 				host = "smtp.mail.me.com";
diff --git a/profiles/neverest.nix b/profiles/neverest.nix
index 6d6979d..612fb36 100644
--- a/profiles/neverest.nix
+++ b/profiles/neverest.nix
@@ -6,13 +6,13 @@
 }:
 with lib; let
 	tomlFormat = pkgs.formats.toml {};
-	account = config.accounts.email.accounts.icloud;
+	account = config.accounts.email.accounts."christoph@schmatzler.com";
 	maildirPath = account.maildir.absPath;
 in {
 	home.packages = [pkgs.neverest];
 
 	xdg.configFile."neverest/config.toml".source = tomlFormat.generate "neverest-config.toml" {
-		accounts.icloud = {
+		accounts."christoph@schmatzler.com" = {
 			default = true;
 
 			folder.filters = "all";