Attempt boot fixes
This commit is contained in:
parent
b3cda7c142
commit
9869100b8e
5 changed files with 4255 additions and 11 deletions
|
@ -9,11 +9,16 @@
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
./disk-config.nix
|
./disk-config.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
boot.loader.systemd-boot.enable = false;
|
||||||
|
|
||||||
boot.loader.grub = {
|
boot.loader.grub = {
|
||||||
|
enable = true;
|
||||||
# no need to set devices, disko will add all devices that have a EF02 partition to the list already
|
# no need to set devices, disko will add all devices that have a EF02 partition to the list already
|
||||||
# devices = [ ];
|
devices = [ "/dev/nvme0n1" ];
|
||||||
efiSupport = true;
|
# device = "/dev/nvme0n1";
|
||||||
efiInstallAsRemovable = true;
|
efiSupport = false;
|
||||||
|
# efiInstallAsRemovable = true;
|
||||||
};
|
};
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
||||||
|
@ -26,11 +31,5 @@
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHDuOIycRP7Ney136ro/doWj1kttJUqmbGz6OC2nia09 michael.huebner@ptspaper.de"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHDuOIycRP7Ney136ro/doWj1kttJUqmbGz6OC2nia09 michael.huebner@ptspaper.de"
|
||||||
];
|
];
|
||||||
|
|
||||||
# # even though we have raid 1, we only boot from the first disk with the zfs setup
|
|
||||||
boot.loader.grub.devices = [ "/dev/nvme0n1" ];
|
|
||||||
# # this was generated with `head -c4 /dev/urandom | od -A none -t x4`
|
|
||||||
# networking.hostId = "32fd1c31";
|
|
||||||
|
|
||||||
|
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,4 +83,4 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
4182
facter.json
Normal file
4182
facter.json
Normal file
File diff suppressed because it is too large
Load diff
|
@ -56,7 +56,8 @@
|
||||||
modules = [
|
modules = [
|
||||||
disko.nixosModules.disko
|
disko.nixosModules.disko
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
./hardware-configuration.nix
|
nixos-facter-modules.nixosModules.facter
|
||||||
|
{ config.facter.reportPath = ./facter.json; }
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
62
hardware-configuration.nix
Normal file
62
hardware-configuration.nix
Normal file
|
@ -0,0 +1,62 @@
|
||||||
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports =
|
||||||
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" ];
|
||||||
|
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
||||||
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/" =
|
||||||
|
{ device = "tmpfs";
|
||||||
|
fsType = "tmpfs";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/nix/.rw-store" =
|
||||||
|
{ device = "tmpfs";
|
||||||
|
fsType = "tmpfs";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/nix/.ro-store" =
|
||||||
|
{ device = "/nix/store/fz3m5p11iiy094iradd3y6l76dfxf3yl-squashfs.img (deleted)";
|
||||||
|
fsType = "squashfs";
|
||||||
|
options = [ "loop" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/nix/store" =
|
||||||
|
{ device = "overlay";
|
||||||
|
fsType = "overlay";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/etc" =
|
||||||
|
{ device = "overlay";
|
||||||
|
fsType = "overlay";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/mnt" =
|
||||||
|
{ device = "/dev/disk/by-uuid/3910b9f0-99b6-4a35-a308-2c2c3ec33ba3";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/mnt/boot" =
|
||||||
|
{ device = "/dev/disk/by-uuid/AC28-2C41";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [ "fmask=0077" "dmask=0077" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [ ];
|
||||||
|
|
||||||
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp35s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
boot.swraid.enable = true;
|
||||||
|
}
|
Loading…
Reference in a new issue