diff options
| author | Zhaofeng Li <hello@zhaofeng.li> | 2021-07-22 21:51:16 -0700 |
|---|---|---|
| committer | Zhaofeng Li <hello@zhaofeng.li> | 2021-07-22 22:01:44 -0700 |
| commit | 34d2b8329146c9068af20c1dbb71bff94f9b2abe (patch) | |
| tree | 3ea4d1c6db9e8587d56954565c8808105b3d476c /nixos | |
| parent | 3af210329f8dcbcaac23a9553a21acd5628a672f (diff) | |
| download | nixpkgs-34d2b8329146c9068af20c1dbb71bff94f9b2abe.tar nixpkgs-34d2b8329146c9068af20c1dbb71bff94f9b2abe.tar.gz nixpkgs-34d2b8329146c9068af20c1dbb71bff94f9b2abe.tar.bz2 nixpkgs-34d2b8329146c9068af20c1dbb71bff94f9b2abe.tar.lz nixpkgs-34d2b8329146c9068af20c1dbb71bff94f9b2abe.tar.xz nixpkgs-34d2b8329146c9068af20c1dbb71bff94f9b2abe.tar.zst nixpkgs-34d2b8329146c9068af20c1dbb71bff94f9b2abe.zip | |
nixos/klipper: Allow lists as values for gcode_macro
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/klipper.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index 4930648ba8e..909408225e0 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -2,7 +2,13 @@ with lib; let cfg = config.services.klipper; - format = pkgs.formats.ini { mkKeyValue = generators.mkKeyValueDefault {} ":"; }; + format = pkgs.formats.ini { + # https://github.com/NixOS/nixpkgs/pull/121613#issuecomment-885241996 + listToValue = l: + if builtins.length l == 1 then generators.mkValueStringDefault {} (head l) + else lib.concatMapStrings (s: "\n ${generators.mkValueStringDefault {} s}") l; + mkKeyValue = generators.mkKeyValueDefault {} ":"; + }; in { ##### interface |