From 2f8cbcf48a49667ffcd2d25f25e6319fac41577a Mon Sep 17 00:00:00 2001
From: Jet <jet@extremist.software>
Date: Thu, 23 Apr 2026 21:38:36 -0700
Subject: [PATCH 1/2] feat: make betterbird declaritive

---
 home-modules/desktop.nix  |  2 +-
 home-modules/lib.nix      | 54 ++++++++++++++++++++++++++++++++++++++-
 home-modules/packages.nix |  1 +
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/home-modules/desktop.nix b/home-modules/desktop.nix
index 26f7e22..605db53 100644
--- a/home-modules/desktop.nix
+++ b/home-modules/desktop.nix
@@ -121,7 +121,7 @@ in
       "x-scheme-handler/https" = "zen-beta.desktop";
       "x-scheme-handler/about" = "zen-beta.desktop";
       "x-scheme-handler/unknown" = "zen-beta.desktop";
-      "x-scheme-handler/mailto" = "eu.betterbird.Betterbird.desktop";
+      "x-scheme-handler/mailto" = "betterbird.desktop";
       "inode/directory" = "org.gnome.Nautilus.desktop";
       "application/zip" = "org.gnome.FileRoller.desktop";
       "application/x-tar" = "org.gnome.FileRoller.desktop";
diff --git a/home-modules/lib.nix b/home-modules/lib.nix
index c272cd6..a1a77d8 100644
--- a/home-modules/lib.nix
+++ b/home-modules/lib.nix
@@ -42,6 +42,57 @@ let
     rev = "4ae5198fb82fe28d7b452796152f2b1745051c77";
     hash = "sha256-NvDd3BSVeS10kYupLxo27VlKeeHPHrxyTb8EdVqrtQw=";
   };
+  betterbird = pkgs.stdenvNoCC.mkDerivation rec {
+    pname = "betterbird";
+    version = "140.10.0esr-bb21";
+
+    src = pkgs.fetchurl {
+      url = "https://www.betterbird.eu/downloads/LinuxArchive/betterbird-${version}.en-US.linux-x86_64.tar.xz";
+      hash = "sha256-Uh55xWn/cjoIutX2xdM/jUWw9c2As8P4fefK5KQtbQo=";
+    };
+
+    nativeBuildInputs = [ pkgs.makeWrapper ];
+
+    sourceRoot = ".";
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p "$out/lib" "$out/bin" "$out/share"
+      cp -r betterbird "$out/lib/betterbird"
+
+      ln -s "$out/lib/betterbird/betterbird" "$out/bin/betterbird"
+
+      if [ -d "$out/lib/betterbird/chrome/icons/default" ]; then
+        mkdir -p "$out/share/icons/hicolor/128x128/apps"
+        cp "$out/lib/betterbird/chrome/icons/default/default128.png" "$out/share/icons/hicolor/128x128/apps/betterbird.png"
+      fi
+
+      mkdir -p "$out/share/applications"
+      cat > "$out/share/applications/betterbird.desktop" <<EOF
+      [Desktop Entry]
+      Name=Betterbird
+      Comment=Mail, RSS and newsgroups client
+      Exec=$out/bin/betterbird %u
+      Terminal=false
+      Type=Application
+      Icon=betterbird
+      Categories=Network;Email;
+      MimeType=x-scheme-handler/mailto;message/rfc822;x-scheme-handler/webcal;x-scheme-handler/webcals;
+      StartupNotify=true
+      EOF
+
+      runHook postInstall
+    '';
+
+    meta = with pkgs.lib; {
+      description = "Betterbird mail client";
+      homepage = "https://www.betterbird.eu/";
+      sourceProvenance = [ sourceTypes.binaryNativeCode ];
+      license = licenses.mpl20;
+      platforms = [ "x86_64-linux" ];
+    };
+  };
   nasaApodWallpaper = pkgs.writeShellApplication {
     name = "nasa-apod-wallpaper";
     runtimeInputs = [
@@ -288,7 +339,7 @@ let
     name = "betterbird-startup";
     desktopName = "Betterbird Startup";
     comment = "Launch Betterbird in fullscreen";
-    exec = "${pkgs.flatpak}/bin/flatpak run eu.betterbird.Betterbird --fullscreen";
+    exec = "${betterbird}/bin/betterbird";
     terminal = false;
     categories = [ "Network" ];
   };
@@ -305,6 +356,7 @@ in
   _module.args.homeLib = {
     inherit
       betterbirdStartup
+      betterbird
       email
       greptileSkills
       kittyZellijStartup
diff --git a/home-modules/packages.nix b/home-modules/packages.nix
index 06a0944..f61a705 100644
--- a/home-modules/packages.nix
+++ b/home-modules/packages.nix
@@ -55,6 +55,7 @@
     zulip
     linphone
     lmstudio
+    homeLib.betterbird
 
     nerd-fonts.commit-mono
 

From f4622860306e5d7d84faff11fc212ae29596576c Mon Sep 17 00:00:00 2001
From: Jet <jet@extremist.software>
Date: Fri, 24 Apr 2026 11:40:18 -0700
Subject: [PATCH 2/2] update: nfu

---
 flake.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 11d1027..4faefda 100644
--- a/flake.lock
+++ b/flake.lock
@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776983249,
-        "narHash": "sha256-+pk4p17ycwdZZRXlsTKl6L70v9uxQ+JEboguTwokyqA=",
+        "lastModified": 1777054018,
+        "narHash": "sha256-tTNS7V6xN/LX1KZ0TrdOnj375ZrsUlLoce4qxZwDN9U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5a9efa93c586f79e80b0ad7d8036c450f53c3d1d",
+        "rev": "ffbd94a1c9d7d3e1258e51c084ab2109da04f2b1",
         "type": "github"
       },
       "original": {
@@ -139,11 +139,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776983092,
-        "narHash": "sha256-xhwBe62JJ7vKxTD05RRXHZBdavKUwxX7s/Y8rWUsfHo=",
+        "lastModified": 1777054150,
+        "narHash": "sha256-/Ri3iBC8nFIzjq47Bw13ARanGdINL+pr7jEPKzDtHL8=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "3b1263dc833a9f1dd32ee04853f69477af78b2f1",
+        "rev": "6a4b81cf8e0dafa8003fb6154b979c433c6f1e05",
         "type": "github"
       },
       "original": {
@@ -207,11 +207,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776980848,
-        "narHash": "sha256-4RFnPmXtyJIKdHgVvnN6TAX091W7LDKssYBbVkfbWWw=",
+        "lastModified": 1777008980,
+        "narHash": "sha256-pVZgqx3xbyFs0CnVlPLsizHL+S8vK1JcHQ1WVw/X+NI=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "2efc029734e4813003a9f885d6b27563b7b6b046",
+        "rev": "269ed2e95863c99ce067672813767661612e402b",
         "type": "github"
       },
       "original": {