From b27e5512709aa7ac355b78b0223096bae362003e Mon Sep 17 00:00:00 2001
From: Chris <chris@echoz.io>
Date: Tue, 7 Oct 2025 17:04:44 +0200
Subject: [PATCH] aerc: change stylesets option to reflect the structure aerc
 expects

Instead of placing all 'stylesets' attribute set values into the 'global'
section this places them in the specified section.
---
 modules/programs/aerc/default.nix              |  6 +++---
 tests/modules/programs/aerc/settings.nix       | 18 ++++++++++++------
 tests/modules/programs/aerc/stylesets.expected |  3 +++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/modules/programs/aerc/default.nix b/modules/programs/aerc/default.nix
index 442846e46..28d3d146a 100644
--- a/modules/programs/aerc/default.nix
+++ b/modules/programs/aerc/default.nix
@@ -104,10 +104,10 @@ in
     };
 
     stylesets = mkOption {
-      type = with types; attrsOf (either confSection lines);
+      type = with types; attrsOf (sectionsOrLines);
       default = { };
       example = literalExpression ''
-        { default = { ui = { "tab.selected.reverse" = toggle; }; }; };
+        { default = { ui = { "tab.selected.reverse" = "toggle"; }; }; };
       '';
       description = ''
         Stylesets added to {file}`$HOME/.config/aerc/stylesets/`.
@@ -166,7 +166,7 @@ in
       mkStyleset = attrsets.mapAttrs' (
         k: v:
         let
-          value = if lib.isString v then v else sectionsToINI { global = v; };
+          value = if lib.isString v then v else sectionsToINI v;
         in
         {
           name = "${configDir}/stylesets/${k}";
diff --git a/tests/modules/programs/aerc/settings.nix b/tests/modules/programs/aerc/settings.nix
index a0318e642..c41fc51a4 100644
--- a/tests/modules/programs/aerc/settings.nix
+++ b/tests/modules/programs/aerc/settings.nix
@@ -94,14 +94,20 @@
           error.fg = red
           header.bold = true
           title.reverse = true
+
+          [ui]
+          tab.selected.reverse = toggle
         '';
         default = {
-          "*.default" = "true";
-          "*error.bold" = "true";
-          "error.fg" = "red";
-          "header.bold" = "true";
-          "*.selected.reverse" = "toggle";
-          "title.reverse" = "true";
+          global = {
+            "*.default" = "true";
+            "*error.bold" = "true";
+            "error.fg" = "red";
+            "header.bold" = "true";
+            "*.selected.reverse" = "toggle";
+            "title.reverse" = "true";
+          };
+          ui."tab.selected.reverse" = "toggle";
         };
       };
 
diff --git a/tests/modules/programs/aerc/stylesets.expected b/tests/modules/programs/aerc/stylesets.expected
index f6ab9d430..af8ee6869 100644
--- a/tests/modules/programs/aerc/stylesets.expected
+++ b/tests/modules/programs/aerc/stylesets.expected
@@ -6,3 +6,6 @@
 error.fg = red
 header.bold = true
 title.reverse = true
+
+[ui]
+tab.selected.reverse = toggle