From 7b1c38bbd3dce2509f1bc30a2269f71948b84c5f Mon Sep 17 00:00:00 2001
From: Sven Wilhelm <refnode@gmail.com>
Date: Tue, 12 Aug 2025 09:41:08 +0200
Subject: [PATCH] refactor: modularize mail tools

Extract mail-related tools from core user packages into optional
module:

- Add mail clients: neomutt, himalaya
- Add mail utilities: msmtp, mu, abook
- Add refnode's own tooling: ref-mail-*
- Add contacts/calendar: vdirsyncer, khard, khal
---
 users/refnode/common/optional/mailtools.nix | 27 +++++++++++++++++++++
 users/refnode/default.nix                   | 13 +---------
 2 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 users/refnode/common/optional/mailtools.nix

diff --git a/users/refnode/common/optional/mailtools.nix b/users/refnode/common/optional/mailtools.nix
new file mode 100644
index 0000000..d5c6dc2
--- /dev/null
+++ b/users/refnode/common/optional/mailtools.nix
@@ -0,0 +1,27 @@
+{ pkgs, ... }:
+
+{
+  # Mail tools for email management and scripting
+  
+  home.packages = with pkgs; [
+    # Mail clients
+    neomutt
+    unstable.himalaya
+    
+    # Mail utilities
+    unstable.msmtp
+    unstable.mu
+    abook
+    
+    # refnode's own tooling
+    ref-mail
+    ref-mail-cd
+    ref-mail-cdv
+    ref-mail-sync
+    
+    # Contacts and calendar
+    vdirsyncer
+    khard
+    khal
+  ];
+}
diff --git a/users/refnode/default.nix b/users/refnode/default.nix
index 6214628..aa8c88b 100644
--- a/users/refnode/default.nix
+++ b/users/refnode/default.nix
@@ -4,6 +4,7 @@
     ./common/optional/desktop/darwin.nix
     ./common/optional/kubernetes.nix
     ./common/optional/rust.nix
+    ./common/optional/mailtools.nix
   ];
 
   # specify my home-manager configs
@@ -22,17 +23,12 @@
     direnv
     pdfgrep
     jasper
-    abook
     lf
     universal-ctags
     ref-rebuild
     ref-sysupdate
     ref-ykey-check
     ref-main
-    ref-mail
-    ref-mail-cd
-    ref-mail-cdv
-    ref-mail-sync
     ref-irc
     ref-pathlist
     ref-git-bare-clone-update
@@ -72,10 +68,6 @@
     just
     #
     vlc-bin-universal
-    # contacts / calendar
-    vdirsyncer
-    khard
-    khal
 
     unstable.fd
     unstable.eza
@@ -87,7 +79,6 @@
     unstable.graphviz
     unstable.plantuml-c4
     unstable.ffmpeg_7
-    unstable.msmtp
     unstable.go
     unstable.gopls
     unstable.goreleaser
@@ -103,11 +94,9 @@
     unstable.jujutsu
     unstable.minio-client
     unstable.kanata
-    unstable.himalaya
 
     unstable.taskwarrior3
     # unstable.ladybird
-    neomutt
     unstable.claude-code
   ];