From 9e9ed68fcdf84b69c17f2a077ea038e7a5d28bf5 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 27 Jun 2022 01:16:23 +0200 Subject: machines/leguin: fix boot partitions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I had them copied from the wrong module, of course this can’t work. Since the kernel config & boot loader config is now in thinkpad, this might just work (famous last words). --- machines/profpatsch/leguin.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'machines/profpatsch') diff --git a/machines/profpatsch/leguin.nix b/machines/profpatsch/leguin.nix index bc9fed67..c1c6f195 100644 --- a/machines/profpatsch/leguin.nix +++ b/machines/profpatsch/leguin.nix @@ -35,17 +35,18 @@ in }; - boot.loader.grub.device = "/dev/sda"; + boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-label/root"; - fileSystems = { - "/" = { - device = "/dev/sda3"; - fsType = "ext4"; - }; - "/boot" = { - device = "/dev/sda2"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + fsType = "btrfs"; + options = [ "ssd" "subvol=/root" ]; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-label/BOOT"; + fsType = "vfat"; + options = ["nofail"]; }; vuizvui.user.profpatsch.server.sshPort = 7001; -- cgit 1.4.1