karaolidis/nix
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix installer

Browse Source 
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
Nick Karaolidis
2025-01-27 18:59:07 +00:00
parent 69578a83fc
commit 20da47f994
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hosts/common/configs/system/nix-install/install.sh
View File

@@ -54,7 +54,7 @@ set_password_file() {
exit 1 exit 1
fi fi
ln -sf "$password_file" /tmp/installer.key ln -sf "$(realpath "$password_file")" /tmp/installer.key
else else
echo "Enter password for LUKS encryption:" echo "Enter password for LUKS encryption:"
IFS= read -r -s password IFS= read -r -s password
@@ -68,6 +68,7 @@ set_password_file() {
prepare_disk() { prepare_disk() {
local disko_mode="$1" local disko_mode="$1"
mkdir -p /mnt
root=$(mktemp -d /mnt/install.XXXXXX) root=$(mktemp -d /mnt/install.XXXXXX)
disko -m "$disko_mode" --yes-wipe-all-disks --root-mountpoint "$root" "$flake/hosts/$host/format.nix" --arg device "\"$device\"" disko -m "$disko_mode" --yes-wipe-all-disks --root-mountpoint "$root" "$flake/hosts/$host/format.nix" --arg device "\"$device\""
} }

2
hosts/installer/default.nix
View File

@@ -42,5 +42,5 @@
sops.defaultSopsFile = ./secrets/secrets.yaml; sops.defaultSopsFile = ./secrets/secrets.yaml;
environment.impermanence.device = environment.impermanence.device =
config.disko.devices.disk.usb.content.partitions.root.content.name; config.disko.devices.disk.installer.content.partitions.root.content.name;
} }

4
hosts/installer/format.nix
View File

@@ -4,7 +4,7 @@
}: }:
{ {
disko.devices = { disko.devices = {
disk.usb = { disk.installer = {
inherit device; inherit device;
type = "disk"; type = "disk";
content = { content = {
@@ -30,7 +30,7 @@
name = "root"; name = "root";
size = "100%"; size = "100%";
content = { content = {
name = "usb"; name = "installer";
type = "luks"; type = "luks";
passwordFile = "/tmp/installer.key"; passwordFile = "/tmp/installer.key";
settings = { settings = {

1
hosts/installer/users/nick/default.nix
View File

@@ -15,6 +15,7 @@ in
(import ../../../common/configs/user/console/git { inherit user home; }) (import ../../../common/configs/user/console/git { inherit user home; })
(import ../../../common/configs/user/console/gpg-agent { inherit user home; }) (import ../../../common/configs/user/console/gpg-agent { inherit user home; })
(import ../../../common/configs/user/console/home-manager { inherit user home; }) (import ../../../common/configs/user/console/home-manager { inherit user home; })
(import ../../../common/configs/user/console/jq { inherit user home; })
(import ../../../common/configs/user/console/lsof { inherit user home; }) (import ../../../common/configs/user/console/lsof { inherit user home; })
(import ../../../common/configs/user/console/ncdu { inherit user home; }) (import ../../../common/configs/user/console/ncdu { inherit user home; })
(import ../../../common/configs/user/console/neovim { inherit user home; }) (import ../../../common/configs/user/console/neovim { inherit user home; })