Prefix valhalla related settings
This commit is contained in:
parent
2ca85d797b
commit
42c7d24198
9 changed files with 113 additions and 104 deletions
scripts/Arch/OS
|
@ -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 partition.rootDir --raw)
|
||||
set -q ARCH_MOUNT_ROOT || set -l ARCH_MOUNT_ROOT (getConfig valhalla.partition.rootDir --raw)
|
||||
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
|
||||
|
@ -49,7 +49,7 @@ begin
|
|||
and arch-chroot "$ARCH_MOUNT_ROOT" hwclock --systohc
|
||||
|
||||
and begin
|
||||
getConfig i18n.localeSettings --json | \
|
||||
getConfig valhalla.i18n.localeSettings --json | \
|
||||
jq --raw-output '[.[] | split(".") | .[0]] | unique | join("\\\\|")'
|
||||
end | begin
|
||||
read LOCALES
|
||||
|
@ -57,7 +57,7 @@ begin
|
|||
end
|
||||
|
||||
and begin
|
||||
getConfig i18n.localeSettings --json | \
|
||||
getConfig valhalla.i18n.localeSettings --json | \
|
||||
jq --raw-output '[keys[] as $key | "\($key)=\(.[$key])"] | join("\n")'
|
||||
end | arch-chroot "$ARCH_MOUNT_ROOT" tee /etc/locale.conf > /dev/null
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
|
|||
CONFIG_MODULE="${CONFIG_MODULE:-"./config.nix"}";
|
||||
ARCH_TIMEZONE="${ARCH_TIMEZONE:-"Europe/Zurich"}";
|
||||
ARCH_HOSTNAME="${ARCH_HOSTNAME}";
|
||||
ARCH_MOUNT_ROOT="${ARCH_MOUNT_ROOT:-"$(../../eval-module.sh "$CONFIG_MODULE" partition.rootDir --raw)"}";
|
||||
ARCH_MOUNT_ROOT="${ARCH_MOUNT_ROOT:-"$(../../eval-module.sh "$CONFIG_MODULE" valhalla.partition.rootDir --raw)"}";
|
||||
ARCH_LANG="${ARCH_LANG:-"en_US.UTF-8"}";
|
||||
ARCH_KEYMAP="${ARCH_KEYMAP:-"de_CH-latin1"}";
|
||||
ARCH_X11_KEYMAP="${ARCH_X11_KEYMAP:-"ch"}";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue