From b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B?= <clement@cbouvet.fr>
Date: Thu, 27 Mar 2025 18:49:40 +0100
Subject: [PATCH 1/4] fzf: update zsh integration to be after plugins (#6716)

---
 modules/programs/fzf.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/fzf.nix b/modules/programs/fzf.nix
index 77a431f33..76c5e2c4b 100644
--- a/modules/programs/fzf.nix
+++ b/modules/programs/fzf.nix
@@ -198,7 +198,7 @@ in {
     # Still needs to be initialized after oh-my-zsh (order 800), otherwise
     # omz will take precedence.
     programs.zsh.initContent =
-      mkIf cfg.enableZshIntegration (mkOrder 810 zshIntegration);
+      mkIf cfg.enableZshIntegration (mkOrder 910 zshIntegration);
 
     programs.fish.interactiveShellInit =
       mkIf cfg.enableFishIntegration (mkOrder 200 fishIntegration);

From 13d68e9ac05caccc1f81ce40612a8086421e1706 Mon Sep 17 00:00:00 2001
From: Shogo Takata <peshogo@gmail.com>
Date: Fri, 28 Mar 2025 13:31:30 +0900
Subject: [PATCH 2/4] helix: avoid IFD (#6714)

Avoids IFD in the helix module which was introduced in #6575.
The helix module fails to build when --no-allow-import-from-derivation is enabled.
---
 modules/programs/helix.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/programs/helix.nix b/modules/programs/helix.nix
index 6529e6c22..3119a06d4 100644
--- a/modules/programs/helix.nix
+++ b/modules/programs/helix.nix
@@ -212,9 +212,13 @@ in {
     xdg.configFile = let
       settings = {
         "helix/config.toml" = mkIf (cfg.settings != { }) {
-          text =
-            builtins.readFile (tomlFormat.generate "helix-config" cfg.settings)
-            + "\n" + cfg.extraConfig;
+          source = let
+            configFile = tomlFormat.generate "config.toml" cfg.settings;
+            extraConfigFile =
+              pkgs.writeText "extra-config.toml" ("\n" + cfg.extraConfig);
+          in pkgs.runCommand "helix-config.toml" { } ''
+            cat ${configFile} ${extraConfigFile} >> $out
+          '';
         };
         "helix/languages.toml" = mkIf (cfg.languages != { }) {
           source = tomlFormat.generate "helix-languages-config" cfg.languages;

From 26ccff08df360afd888b08633a5dddbb99f04d8f Mon Sep 17 00:00:00 2001
From: Dominic Meyer <103406971+dominicmeyer@users.noreply.github.com>
Date: Fri, 28 Mar 2025 05:32:30 +0100
Subject: [PATCH 3/4] thunderbird: set additional gmail smtpserver settings
 (#6713)

To resolve issues when using gmail with thunderbird, added default smtpserver authMethod of oauth
---
 modules/programs/thunderbird.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index 9e869025f..d567ab44f 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -387,6 +387,8 @@ in {
         attrsOf (submodule ({ config, ... }: {
           config.thunderbird = {
             settings = lib.mkIf (config.flavor == "gmail.com") (id: {
+              "mail.smtpserver.smtp_${id}.authMethod" =
+                mkOptionDefault 10; # 10 = OAuth2
               "mail.server.server_${id}.authMethod" =
                 mkOptionDefault 10; # 10 = OAuth2
               "mail.server.server_${id}.socketType" =

From 1efd2503172016a6742c87b47b43ca2c8145607d Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Fri, 28 Mar 2025 05:36:12 +0100
Subject: [PATCH 4/4] flake.lock: Update (#6708)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/a84ebe20c6bc2ecbcfb000a50776219f48d134cc?narHash=sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ%3D' (2025-03-19)
  → 'github:NixOS/nixpkgs/1e5b653dff12029333a6546c11e108ede13052eb?narHash=sha256-G5n%2BFOXLXcRx%2B3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w%3D' (2025-03-22)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 62e06142f..c0e3b5c70 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742422364,
-        "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
+        "lastModified": 1742669843,
+        "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
+        "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
         "type": "github"
       },
       "original": {