From 370f46be16067630ec4cc5ccf9f14200dec8265f Mon Sep 17 00:00:00 2001 From: Alejandro Angulo Date: Sun, 10 Dec 2023 15:27:14 -0800 Subject: [PATCH] Replaced grub with systemd-boot Stopped using a ZFS pool for my boot partition. Fixed this error in during boot (using grub): > error: compression algorithm inherit not supported. --- systems/x86_64-linux/gospel/default.nix | 5 ----- .../gospel/hardware-configuration.nix | 14 +------------- systems/x86_64-linux/gospel/zfs.nix | 19 +------------------ 3 files changed, 2 insertions(+), 36 deletions(-) diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix index 4baf751..7c51624 100644 --- a/systems/x86_64-linux/gospel/default.nix +++ b/systems/x86_64-linux/gospel/default.nix @@ -46,11 +46,6 @@ services.syncoid = { enable = true; commands = { - "bpool" = { - target = "backups@192.168.113.13:tank/backups/gospel/bpool"; - recursive = true; - sshKey = "/var/lib/syncoid/.ssh/id_ed25519"; - }; "rpool" = { target = "backups@192.168.113.13:tank/backups/gospel/rpool"; recursive = true; diff --git a/systems/x86_64-linux/gospel/hardware-configuration.nix b/systems/x86_64-linux/gospel/hardware-configuration.nix index 79a3448..19cbd68 100644 --- a/systems/x86_64-linux/gospel/hardware-configuration.nix +++ b/systems/x86_64-linux/gospel/hardware-configuration.nix @@ -42,22 +42,10 @@ }; fileSystems."/boot" = { - device = "bpool/nixos/root"; - fsType = "zfs"; - options = ["zfsutil" "X-mount.mkdir"]; - }; - - fileSystems."/boot/efis/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086-part1" = { - device = "/dev/disk/by-uuid/1443-371C"; + device = "/dev/disk/by-uuid/3C7C-03C4"; fsType = "vfat"; }; - fileSystems."/boot/efi" = { - device = "/boot/efis/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086-part1"; - fsType = "none"; - options = ["bind"]; - }; - swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/systems/x86_64-linux/gospel/zfs.nix b/systems/x86_64-linux/gospel/zfs.nix index 8a5b23f..18cb338 100644 --- a/systems/x86_64-linux/gospel/zfs.nix +++ b/systems/x86_64-linux/gospel/zfs.nix @@ -6,24 +6,7 @@ boot.supportedFilesystems = ["zfs"]; networking.hostId = "f8616592"; boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; - boot.loader.efi.efiSysMountPoint = "/boot/efis/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086-part1"; boot.loader.efi.canTouchEfiVariables = false; - boot.loader.generationsDir.copyKernels = true; - boot.loader.grub.efiInstallAsRemovable = true; - boot.loader.grub.enable = true; - boot.loader.grub.copyKernels = true; - boot.loader.grub.efiSupport = true; - boot.loader.grub.zfsSupport = true; - boot.loader.grub.extraInstallCommands = '' - ESP_MIRROR=$(${pkgs.coreutils}/bin/mktemp -d) - ${pkgs.coreutils}/bin/cp -r /boot/efis/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086-part1/EFI $ESP_MIRROR - for i in /boot/efis/*; do - ${pkgs.coreutils}/bin/cp -r $ESP_MIRROR/EFI $i - done - ${pkgs.coreutils}/bin/rm -rf $ESP_MIRROR - ''; - boot.loader.grub.devices = [ - "/dev/disk/by-id/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086" - ]; + boot.loader.systemd-boot.enable = true; users.users.root.initialHashedPassword = "$6$3Ps2Vmff.gUBkiCv$FCeCQjDvNTdWynQU81qtCXFHQht86w4unWNalUgkcyq7lkkI2klzRyTK3dZiQUjIrn8qPKtwJcY9SNdyE8v1L/"; }