nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

aerc: allow config sections to be lines (#7280)

Browse source 
There are some sections that are order sensitive, e.g. filters,
so just lines will preserve that order.

Fixes: #6059
This commit is contained in:
Lukas Nagel 2025-07-05 02:54:53 +02:00 • committed by GitHub
parent 7d9e3c35f0
commit 57d1027e1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 47 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

41
modules/programs/aerc/default.nix
View file

@ -33,7 +33,7 @@ let
confSection = types.attrsOf primitive;
confSections = types.attrsOf confSection;
confSections = types.attrsOf (types.either types.lines confSection);
sectionsOrLines = types.either types.lines confSections;
@ -132,30 +132,39 @@ in
let
joinCfg = cfgs: lib.concatStringsSep "\n" (lib.filter (v: v != "") cfgs);
toINI =
conf: # quirk: global section is prepended w/o section heading
sectionsToINI =
conf:
let
global = conf.global or { };
local = removeAttrs conf [ "global" ];
mkValueString =
v:
if lib.isList v then # join with comma
lib.concatStringsSep "," (map (generators.mkValueStringDefault { }) v)
else
generators.mkValueStringDefault { } v;
mkKeyValue = generators.mkKeyValueDefault { inherit mkValueString; } " = ";
in
joinCfg [
(generators.toKeyValue { inherit mkKeyValue; } global)
(generators.toINI { inherit mkKeyValue; } local)
];
joinCfg ([ (sectionToINI "global" global) ] ++ (lib.mapAttrsToList sectionToINI local));
mkINI = conf: if lib.isString conf then conf else toINI conf;
sectionToINI =
name: section:
let
# quirk: global section is prepended w/o section heading
header = if name == "global" then "" else "[${lib.escape [ "[" "]" ] name}]\n";
content =
if lib.isString section then section else generators.toKeyValue { inherit mkKeyValue; } section;
in
if builtins.stringLength content > 0 then header + content else "";
mkValueString =
v:
if lib.isList v then # join with comma
lib.concatStringsSep "," (map (generators.mkValueStringDefault { }) v)
else
generators.mkValueStringDefault { } v;
mkINI = conf: if lib.isString conf then conf else sectionsToINI conf;
mkKeyValue = generators.mkKeyValueDefault { inherit mkValueString; } " = ";
mkStyleset = attrsets.mapAttrs' (
k: v:
let
value = if lib.isString v then v else toINI { global = v; };
value = if lib.isString v then v else sectionsToINI { global = v; };
in
{
name = "${configDir}/stylesets/${k}";