First attempt at booting NixOS on curacao directly
This commit is contained in:
parent
d98be4eea5
commit
6f9de6cc4c
|
@ -75,7 +75,7 @@ in
|
|||
content = {
|
||||
type = "filesystem";
|
||||
format = "ext2";
|
||||
mountpoint = "/boot";
|
||||
mountpoint = "/mnt/old/boot";
|
||||
mountOptions = [
|
||||
"rw"
|
||||
"relatime"
|
||||
|
@ -142,6 +142,7 @@ in
|
|||
type = "luks";
|
||||
name = "rapido";
|
||||
initrdUnlock = true;
|
||||
passwordFile = passwordFile;
|
||||
settings = {
|
||||
keyFile = "/etc/keys/rapido";
|
||||
allowDiscards = true;
|
||||
|
@ -153,17 +154,28 @@ in
|
|||
mountOptions = btrfs_args_ssd;
|
||||
subvolumes = {
|
||||
archlinux = {
|
||||
mountpoint = "/";
|
||||
mountpoint = "/mnt/old";
|
||||
mountOptions = btrfs_args_ssd;
|
||||
};
|
||||
# Should be temporary, to make sure we can revert to Arch anytime
|
||||
"home.nixos" = {
|
||||
mountpoint = "/home";
|
||||
mountOptions = btrfs_args_ssd;
|
||||
};
|
||||
"home.rapido" = {
|
||||
mountpoint = "/home";
|
||||
mountpoint = "/home.old";
|
||||
mountOptions = btrfs_args_ssd;
|
||||
};
|
||||
nix = {
|
||||
mountpoint = "/nix";
|
||||
mountOptions = btrfs_args_ssd;
|
||||
};
|
||||
nixosboot = {
|
||||
mountpoint = "/boot";
|
||||
};
|
||||
nixos = {
|
||||
mountpoint = "/";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
grub = {
|
||||
enable = true;
|
||||
efiSupport = true;
|
||||
device = "nodev"; # Don't install on MBR
|
||||
# TODO Maybe we could? In case the HDD doesn't boot anymore?
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,4 +8,14 @@
|
|||
];
|
||||
|
||||
networking.hostName = "curacao";
|
||||
boot = {
|
||||
initrd.secrets = {
|
||||
"/etc/keys/rapido" = "/etc/keys/rapido";
|
||||
"/etc/keys/rapswap" = "/etc/keys/rapswap";
|
||||
};
|
||||
loader = {
|
||||
grub.enableCryptodisk = true;
|
||||
efi.efiSysMountPoint = "/efi";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue