nix/10.nixos-hardware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

config-txt: fix null removal, file option as types.path

Browse source 
null was not in the settings type, so mkForce null to remove a default
was a type error. Added nullOr to atom and filter nulls in recurse.

Changed file from types.str to types.path with pkgs.writeText — this
is how services.mysql.configFile and similar options work. Moved the
generated file into the option default (with defaultText) rather than
setting it in the config block.
This commit is contained in:
Jamie Magee 2026-03-09 21:17:47 -07:00
parent a688dfcbb5
commit b4766ffecf
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
raspberry-pi/common/config-txt.nix
View file

@ -10,7 +10,12 @@
#
# Reference: https://www.raspberrypi.com/documentation/computers/config_txt.html
{ lib, config, ... }:
{
lib,
config,
pkgs,
...
}:
let
cfg = config.hardware.raspberry-pi.configtxt;
@ -33,9 +38,12 @@ let
# Recursively flatten nested attrs into a list of { conditionals, name, value } records.
# Each nesting level (except the leaf) is a conditional filter.
# "all" filters are omitted from the conditionals list since they reset state.
# null values are filtered out, allowing `mkForce null` to remove defaults.
recurse =
path: value:
if builtins.isAttrs value && !(builtins.isList value) && !(value ? _type) then
if value == null then
[ ]
else if builtins.isAttrs value && !(builtins.isList value) && !(value ? _type) then
lib.flatten (lib.mapAttrsToList (name: recurse ([ name ] ++ path)) value)
else
{
@ -76,11 +84,11 @@ in
type =
with lib.types;
let
atom = oneOf [
atom = nullOr (oneOf [
str
int
bool
];
]);
molecule = oneOf [
atom
(listOf atom)
@ -116,15 +124,13 @@ in
};
file = lib.mkOption {
type = lib.types.str;
type = lib.types.path;
default = pkgs.writeText "config.txt" (toConfigTxt cfg.settings);
defaultText = lib.literalExpression ''pkgs.writeText "config.txt" (generated from settings)'';
description = ''
The generated config.txt content. Defaults to the rendered output of
`settings`, but can be overridden to supply a custom config.txt.
Path to the generated config.txt file. Defaults to the rendered output
of `settings`, but can be overridden to supply a custom config.txt.
'';
};
};
config = {
hardware.raspberry-pi.configtxt.file = lib.mkDefault (toConfigTxt cfg.settings);
};
}