From 59609df5476c831b159a1f8a3f079f938ca49102 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Wed, 8 Jan 2025 16:23:33 +0100
Subject: [PATCH] kmail -> thunderbird

---
 modules/programs-gnome.nix |  1 -
 modules/programs-kde.nix   |  2 +-
 modules/programs.nix       | 96 ++++++++++++++++++++------------------
 3 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/modules/programs-gnome.nix b/modules/programs-gnome.nix
index 3939a39..ead6c9f 100644
--- a/modules/programs-gnome.nix
+++ b/modules/programs-gnome.nix
@@ -2,7 +2,6 @@
 {
   imports = [
     ./file-roller.nix # Archive manager: Compress and decompress
-    ./thunderbird.nix # email
     ./ghostwriter.nix # Markdown editor
     #./gnome-terminal.nix # Terminal emulator.
     ./blackbox.nix # Terminal emulator.
diff --git a/modules/programs-kde.nix b/modules/programs-kde.nix
index 3ddd073..9bd4029 100644
--- a/modules/programs-kde.nix
+++ b/modules/programs-kde.nix
@@ -56,7 +56,7 @@
       # Kontact suite
       # https://kontact.kde.org/
       kdePackages.kontact # Container application for the apps below
-      kdePackages.kmail # email
+      #kdePackages.kmail # email
       kdePackages.kaddressbook # Contacts
       kdePackages.korganizer # Calendar and tasks
       #kdePackages.akregator # RSS feed reader. Does not support Nextcloud News.
diff --git a/modules/programs.nix b/modules/programs.nix
index 9cbc763..16c2992 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -1,17 +1,23 @@
 { config, pkgs, ... }:
 {
+  imports = [
+    ./thunderbird.nix # email
+  ];
+
   users.users.yoda = {
     packages = with pkgs; [
       #
-      # DEVELOPMENT
+      # CLI apps
       #
 
-      # CLI apps
       gnumake # make
       wget
       killall
 
-      # Graphical apps
+      #
+      # Multimedia
+      #
+
       meld # Diff and merge tool
       # Rip DVD and Blu-ray; rotate and export videos.
       # Requires gstreamer with plugins to preview encoded video.
@@ -24,13 +30,54 @@
       identity # Comparing multiple versions of an image or video
       obs-studio # Video recording and live streaming.
       # obs-studio-plugins.obs-vaapi # gstreammer based VAAPI for H.264, H.265 and AV1 encoding. On some AMD hardware this may perform bettern than FFmpeg VAAPI.
+      picard # Music tagger by MusicBrainz
+      tartube-yt-dlp # Video downloader (front-end for yt-dlp)
 
+      #
+      # Internet Censorship Circumvention
+      #
+
+      unstable.riseup-vpn
+      # TODO: Can't download VPN config: Invalid cert of https://api.calyx.net (cert issued for calyx.net not api.calyx.net)
+      #unstable.calyx-vpn
+      # See ./tor-browser.nix
+      # See ./tor.nix
+
+      #
+      # OFFICE
+      #
+
+      junction # Choose the application to open a specific file type or URI.
+      #unstable.servo # Web browser
+      xournalpp # Handwritte notes
+      # Office suite.
+      # For spellcheck, see here: https://nixos.wiki/wiki/LibreOffice#Spellcheck
+      libreoffice-fresh
+      zotero # Collect, organize, cite, and share your research sources
+      anki-bin # Flashcards.
+      #jameica # Hibiscus plugin -> HBCI online banking. Sparkasse-Nürnberg https://www.willuhn.de/wiki/doku.php?id=support:list:banken:spk#nuernberg.
+
+      #planify # Tasks
+      #endeavour # Tasks
+      #errands # Tasks
+
+      telegram-desktop # TODO: Remove again in favour of Signal
       # Other Matrix clients.
       #   fluffychat
       #   Web version: https://app.cinny.in/
       #   cinny-desktop
       #   element-desktop, see `element-desktop.nix`
 
+      #
+      # GIS
+      #
+
+      gnome-maps # Map and GPX viewer, personal and public navigation
+      gpxsee # GPX viewer and analyzer
+
+      #qgis
+      #qgis-ltr # Long Term Release of QGIS
+
       #
       # 3D modeling and printing
       #
@@ -64,49 +111,6 @@
       # Multiple G-code flavors supported (RepRap, Makerbot, Mach3, Machinekit, etc.)
       # SuperSlicer is a PrusaSlicer fork (which is a slic3r fork) (previously Slic3r++).
       #super-slicer
-
-      #
-      # Internet Censorship Circumvention
-      #
-
-      unstable.riseup-vpn
-      # TODO: Can't download VPN config: Invalid cert of https://api.calyx.net (cert issued for calyx.net not api.calyx.net)
-      #unstable.calyx-vpn
-      # See ./tor-browser.nix
-      # See ./tor.nix
-
-      #
-      # OFFICE
-      #
-
-      # Graphical apps
-
-      junction # Choose the application to open a specific file type or URI.
-      #unstable.servo # Web browser
-      tartube-yt-dlp # Video downloader (front-end for yt-dlp)
-      xournalpp # Handwritte notes
-      # Office suite.
-      # For spellcheck, see here: https://nixos.wiki/wiki/LibreOffice#Spellcheck
-      libreoffice-fresh
-      zotero # Collect, organize, cite, and share your research sources
-      anki-bin # Flashcards.
-
-      #planify # Tasks
-      #endeavour # Tasks
-      #errands # Tasks
-      #jameica # Hibiscus plugin -> HBCI online banking. Sparkasse-Nürnberg https://www.willuhn.de/wiki/doku.php?id=support:list:banken:spk#nuernberg.
-      picard # Music tagger by MusicBrainz
-      telegram-desktop # TODO: Remove again in favour of Signal
-
-      #
-      # GIS
-      #
-
-      gnome-maps # Map and GPX viewer, personal and public navigation
-      gpxsee # GPX viewer and analyzer
-
-      #qgis
-      #qgis-ltr # Long Term Release of QGIS
     ];
   };
 }