From 379927dfe0ee2ce40ea87c8de21014d343d5c71e Mon Sep 17 00:00:00 2001 From: caem Date: Thu, 16 Jan 2025 19:22:37 +0100 Subject: [PATCH] fixes --- hosts/vm/disko.nix | 18 +++++++----------- install.sh | 4 ++-- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/hosts/vm/disko.nix b/hosts/vm/disko.nix index cb82948..d61bcd9 100644 --- a/hosts/vm/disko.nix +++ b/hosts/vm/disko.nix @@ -9,20 +9,16 @@ content = { type = "gpt"; partitions = { - ESP = { - priority = 1; - name = "efi"; - start = "1M"; - end = "1024M"; - type = "EF00"; + grub_mbr = { + size = "1M"; + type = "EF02"; # for grub MBR + }; + boot = { + size = "1G"; content = { type = "filesystem"; - format = "vfat"; + format = "ext4"; mountpoint = "/boot"; - mountOptions = [ - "umask=0077" - "noatime" - ]; }; }; root = { diff --git a/install.sh b/install.sh index ddeb311..822811d 100755 --- a/install.sh +++ b/install.sh @@ -125,7 +125,7 @@ ensure_confirmation() { partition_disk() { if [ "$DOTNIX_CONFIRM_DISK_NUKE" = "yes" ]; then - sudo nix run github:nix-community/disko/latest -- --mode destroy,format,mount "./hosts/$DOTNIX_HOSTNAME/disko.nix" + sudo nix run github:nix-community/disko/latest -- --mode destroy,format,mount --yes-wipe-all-disks "./hosts/$DOTNIX_HOSTNAME/disko.nix" else >&2 echo "Aborted installation due to invalid state in the partitioning step." exit 1 @@ -154,7 +154,7 @@ main () { partition_disk generate_config - # todo run the install + # todo install } set -e