trying h002 again, hopefully it can boot
This commit is contained in:
parent
b260451e0b
commit
0bbcd06c81
3 changed files with 3 additions and 15 deletions
|
|
@ -52,7 +52,7 @@
|
||||||
(
|
(
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
boot.loader.grub.device = lib.mkForce "/dev/sdb";
|
boot.loader.grub.device = lib.mkForce "/dev/disk/by-uuid/ca5d2b4d-8964-46c8-99cd-822ac62ac951";
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
inputs.common.nixosModules.hardening
|
inputs.common.nixosModules.hardening
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,6 @@
|
||||||
"usbhid"
|
"usbhid"
|
||||||
"usb_storage"
|
"usb_storage"
|
||||||
"sd_mod"
|
"sd_mod"
|
||||||
"sr_mod"
|
|
||||||
];
|
];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
|
|
||||||
|
|
@ -4,26 +4,15 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
BOOT = "/dev/disk/by-uuid/CC65-4ADF";
|
PRIMARY = "/dev/disk/by-uuid/ca5d2b4d-8964-46c8-99cd-822ac62ac951";
|
||||||
PRIMARY = "/dev/disk/by-uuid/35c8b82e-de7d-45bc-9cb2-2a422a99ee9c";
|
|
||||||
|
|
||||||
SWAP = "/dev/disk/by-uuid/85801775-1aad-4cc8-846a-560f9f4b11f4";
|
SWAP = "/dev/disk/by-uuid/8e3a611e-b9a0-4d42-bc1c-cf1df55d9591";
|
||||||
|
|
||||||
primaryDeviceUnit = "${utils.escapeSystemdPath PRIMARY}.device";
|
primaryDeviceUnit = "${utils.escapeSystemdPath PRIMARY}.device";
|
||||||
in
|
in
|
||||||
lib.mkMerge [
|
lib.mkMerge [
|
||||||
# Main filesystems
|
# Main filesystems
|
||||||
{
|
{
|
||||||
# BOOT
|
|
||||||
fileSystems."/boot" = {
|
|
||||||
device = BOOT;
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [
|
|
||||||
"fmask=0077"
|
|
||||||
"dmask=0077"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# PRIMARY
|
# PRIMARY
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
device = PRIMARY;
|
device = PRIMARY;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue