flake.lock

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

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" = "betterbird.desktop";
+      "x-scheme-handler/mailto" = "eu.betterbird.Betterbird.desktop";
       "inode/directory" = "org.gnome.Nautilus.desktop";
       "application/zip" = "org.gnome.FileRoller.desktop";
       "application/x-tar" = "org.gnome.FileRoller.desktop";

home-modules/lib.nix

@@ -42,57 +42,6 @@ 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 = [
@@ -339,7 +288,7 @@ let
     name = "betterbird-startup";
     desktopName = "Betterbird Startup";
     comment = "Launch Betterbird in fullscreen";
-    exec = "${betterbird}/bin/betterbird";
+    exec = "${pkgs.flatpak}/bin/flatpak run eu.betterbird.Betterbird --fullscreen";
     terminal = false;
     categories = [ "Network" ];
   };
@@ -356,7 +305,6 @@ in
   _module.args.homeLib = {
     inherit
       betterbirdStartup
-      betterbird
       email
       greptileSkills
       kittyZellijStartup

home-modules/packages.nix

@@ -55,7 +55,6 @@
     zulip
     linphone
     lmstudio
-    homeLib.betterbird
 
     nerd-fonts.commit-mono