From b620e32a761ef6376c1097e73b3f8283604e4982 Mon Sep 17 00:00:00 2001
From: Dylan Frankland <dfrankland@users.noreply.github.com>
Date: Tue, 10 Oct 2023 23:10:58 -0700
Subject: fix writing values with containers

Complex container values like `-array` have their own DSL which does not
allow specifying all data types. Instead of using the DSL use plist
fragments instead.
---
 modules/system/defaults-write.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'modules/system')

diff --git a/modules/system/defaults-write.nix b/modules/system/defaults-write.nix
index 2e56d74..7e1fc44 100644
--- a/modules/system/defaults-write.nix
+++ b/modules/system/defaults-write.nix
@@ -5,18 +5,8 @@ with lib;
 let
   cfg = config.system.defaults;
 
-  boolValue = x: if x then "YES" else "NO";
-
-  writeValue = value:
-    if isBool value then "-bool ${boolValue value}" else
-    if isInt value then "-int ${toString value}" else
-    if isFloat value then "-float ${strings.floatToString value}" else
-    if isString value then "-string '${value}'" else
-    if isList value then "-array ${concatStringsSep " " (map (v: writeValue v)value)}" else
-    throw "invalid value type";
-
   writeDefault = domain: key: value:
-    "defaults write ${domain} '${key}' ${writeValue value}";
+    "defaults write ${domain} '${key}' $'${strings.escape [ "'" ] (generators.toPlist { } value)}'";
 
   defaultsToList = domain: attrs: mapAttrsToList (writeDefault domain) (filterAttrs (n: v: v != null) attrs);
 
-- 
cgit v1.2.3