From c2dd9adad43a2e3903fee97fa467d785c72e7e1a Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Thu, 11 Jul 2024 21:01:39 +0200 Subject: [PATCH] Implicitly produce raw output --- scripts/Arch/OS/setup.fish | 2 +- scripts/Common/Scripts/eval-module.fish | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish index 9fa92df8..81a68161 100644 --- a/scripts/Arch/OS/setup.fish +++ b/scripts/Arch/OS/setup.fish @@ -6,7 +6,7 @@ begin set -q CONFIG_MODULE || set -l CONFIG_MODULE "$dir/config.nix" set -q ARCH_TIMEZONE || set -l ARCH_TIMEZONE "Europe/Zurich" - set -q ARCH_MOUNT_ROOT || set -l ARCH_MOUNT_ROOT (getConfig valhalla.partition.rootDir --raw) + set -q ARCH_MOUNT_ROOT || set -l ARCH_MOUNT_ROOT (getConfig valhalla.partition.rootDir) set -q ARCH_LANG || set -l ARCH_LANG en_US.UTF-8 set -q ARCH_KEYMAP || set -l ARCH_KEYMAP de_CH-latin1 set -q ARCH_X11_KEYMAP || set -l ARCH_X11_KEYMAP ch diff --git a/scripts/Common/Scripts/eval-module.fish b/scripts/Common/Scripts/eval-module.fish index 2ffa1b17..534747c9 100644 --- a/scripts/Common/Scripts/eval-module.fish +++ b/scripts/Common/Scripts/eval-module.fish @@ -1,5 +1,11 @@ #!/bin/env fish function evalModule --argument-names modulePath property + set -l argv $argv[3..] + + if not contains -- "--json" $argv + set -a argv --raw + end + set -l nixPkgs 'import { config = {}; overlay = []; }' - nix eval --file "$modulePath" --apply "_: (($nixPkgs).lib.evalModules { modules = [ _ ]; }).config.$property" $argv[3..] + nix eval --file "$modulePath" --apply "_: (($nixPkgs).lib.evalModules { modules = [ _ ]; }).config.$property" $argv end