manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename partitioning modules to config

Browse source
This commit is contained in:
Manuel Thalmann 2024-07-08 01:09:31 +02:00
parent 9d5df120ec
commit eccebe5b17
8 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
profiles/DerGeret/Arch/partition.nix → profiles/DerGeret/Arch/config.nix
View file

@ -1,6 +1,6 @@
{ ... }: { { ... }: {
imports = [ imports = [
../partition.nix ../partition.nix
../../../scripts/Arch/OS/partition.nix ../../../scripts/Arch/OS/config.nix
]; ];
} }

2
profiles/DerGeret/Arch/setup.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
pushd "${BASH_SOURCE%/*}" > /dev/null; pushd "${BASH_SOURCE%/*}" > /dev/null;
PARTITION_MODULE="./partition.nix" \ CONFIG_MODULE="./config.nix" \
ARCH_HOSTNAME="der-geret" \ ARCH_HOSTNAME="der-geret" \
USER_DISPLAYNAME="Manuel Thalmann" \ USER_DISPLAYNAME="Manuel Thalmann" \
. "../../../scripts/Arch/OS/setup.sh"; . "../../../scripts/Arch/OS/setup.sh";

0
profiles/DerGeret/partition.nix → profiles/DerGeret/config.nix
View file

2
profiles/ManuSurface/Arch/partition.nix → profiles/ManuSurface/Arch/config.nix
View file

@ -1,6 +1,6 @@
{ ... }: { { ... }: {
imports = [ imports = [
../../../scripts/Arch/OS/partition.nix ../../../scripts/Arch/OS/config.nix
]; ];
config = { config = {

2
profiles/ManuSurface/Arch/setup.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
pushd "${BASH_SOURCE%/*}" > /dev/null; pushd "${BASH_SOURCE%/*}" > /dev/null;
PARTITION_MODULE="./partition.nix" \ CONFIG_MODULE="./config.nix" \
ARCH_HOSTNAME="manu-surface" \ ARCH_HOSTNAME="manu-surface" \
USER_DISPLAYNAME="Manuel Thalmann" \ USER_DISPLAYNAME="Manuel Thalmann" \
. "../../../scripts/Arch/OS/setup.sh"; . "../../../scripts/Arch/OS/setup.sh";

0
scripts/Arch/OS/partition.nix → scripts/Arch/OS/config.nix
View file

6
scripts/Arch/OS/setup.sh
View file

@ -1,11 +1,11 @@
#!/bin/bash -e #!/bin/bash -e
PARTITION_MODULE="${PARTITION_MODULE:+"$(realpath "$PARTITION_MODULE")"}"; CONFIG_MODULE="${CONFIG_MODULE:+"$(realpath "$CONFIG_MODULE")"}";
pushd "${BASH_SOURCE%/*}" > /dev/null; pushd "${BASH_SOURCE%/*}" > /dev/null;
PARTITION_MODULE="${PARTITION_MODULE:-"./partition.nix"}"; CONFIG_MODULE="${CONFIG_MODULE:-"./config.nix"}";
ARCH_TIMEZONE="${ARCH_TIMEZONE:-"Europe/Zurich"}"; ARCH_TIMEZONE="${ARCH_TIMEZONE:-"Europe/Zurich"}";
ARCH_HOSTNAME="${ARCH_HOSTNAME}"; ARCH_HOSTNAME="${ARCH_HOSTNAME}";
ARCH_MOUNT_ROOT="${ARCH_MOUNT_ROOT:-"$(../../eval-module.sh "$PARTITION_MODULE" partition.rootDir --raw)"}"; ARCH_MOUNT_ROOT="${ARCH_MOUNT_ROOT:-"$(../../eval-module.sh "$CONFIG_MODULE" partition.rootDir --raw)"}";
ARCH_LANG="${ARCH_LANG:-"en_US.UTF-8"}"; ARCH_LANG="${ARCH_LANG:-"en_US.UTF-8"}";
ARCH_KEYMAP="${ARCH_KEYMAP:-"de_CH-latin1"}"; ARCH_KEYMAP="${ARCH_KEYMAP:-"de_CH-latin1"}";
ARCH_X11_KEYMAP="${ARCH_X11_KEYMAP:-"ch"}"; ARCH_X11_KEYMAP="${ARCH_X11_KEYMAP:-"ch"}";

3
scripts/Common/OS/partition.sh
View file

@ -1,3 +1,2 @@
#!/bin/bash #!/bin/bash
PARTITION_MODULE="${PARTITION_MODULE:-"./partition.nix"}"; eval "$(../../eval-module.sh "$CONFIG_MODULE" partition.script --raw)";
eval "$(../../eval-module.sh "$PARTITION_MODULE" partition.script --raw)";