lib/zsh: fix shell escaping and integrate formatShellArrayContent

Replace naive string quoting with lib.escapeShellArg for proper shell escaping
of special characters, spaces, and quotes. Integrate with new formatShellArrayContent
for intelligent multi-line array formatting in zsh array definitions.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>

modules/lib/zsh.nix

@@ -7,9 +7,12 @@ rec {
     if builtins.isBool v then
       if v then "true" else "false"
     else if builtins.isString v then
-      ''"${v}"''
+      lib.escapeShellArg v
     else if builtins.isList v then
-      "(${lib.concatStringsSep " " (map toZshValue v)})"
+      let
+        shell = import ./shell.nix { inherit lib; };
+      in
+      "(${shell.formatShellArrayContent (map toString v)})"
     else
       ''"${toString v}"'';
 

tests/modules/programs/zsh/prezto.nix

@@ -36,6 +36,6 @@
     assertFileContains home-files/.zshenv \
       '. "/home/hm-user/.nix-profile/etc/profile.d/hm-session-vars.sh"'
     assertFileContains home-files/.zshenv \
-      'export FOO="bar"'
+      'export FOO=bar'
   '';
 }

tests/modules/programs/zsh/session-variables.nix

@@ -12,7 +12,7 @@
 
   nmt.script = ''
     assertFileExists home-files/.zshenv
-    assertFileRegex home-files/.zshenv 'export V1="v1"'
+    assertFileRegex home-files/.zshenv 'export V1=v1'
-    assertFileRegex home-files/.zshenv 'export V2="v2-v1"'
+    assertFileRegex home-files/.zshenv 'export V2=v2-v1'
   '';
 }