bootable thinky config

This commit is contained in:
Cyryl Płotnicki 2021-09-11 22:49:03 +02:00
parent 992adb7e73
commit 77032be8e3
3 changed files with 18 additions and 19 deletions

View file

@ -16,9 +16,6 @@
../../backups.nix ../../backups.nix
]; ];
boot.kernelPackages = pkgs.linuxPackages_latest_hardened;
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
time.timeZone = "Europe/Warsaw"; time.timeZone = "Europe/Warsaw";
services.thermald.enable = true; services.thermald.enable = true;

View file

@ -2,21 +2,24 @@
{ {
boot.initrd.availableKernelModules = [ "ata_generic" "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.initrd.luks.devices."root"= boot = {
{ kernelPackages = pkgs.linuxPackages_latest_hardened;
name = "root"; initrd.availableKernelModules = [ "ata_generic" "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod" ];
device = "/dev/disk/by-uuid/962caed1-9dd5-4771-9a8f-3d3f5854af2e"; initrd.luks.devices."crypt"=
preLVM = true; {
allowDiscards = true; device = "/dev/disk/by-uuid/962caed1-9dd5-4771-9a8f-3d3f5854af2e";
preLVM = true;
allowDiscards = true;
};
loader.grub = {
device = "/dev/sda";
};
}; };
time.timeZone = "Europe/Warsaw";
boot.loader.grub = {
device = "/dev/sda";
};
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/11fb2333-f06f-4970-9b74-a5287bab5058"; { device = "/dev/disk/by-uuid/11fb2333-f06f-4970-9b74-a5287bab5058";
fsType = "ext4"; fsType = "ext4";

View file

@ -4,13 +4,12 @@
networking.hostName = "thinky"; networking.hostName = "thinky";
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest_hardened; kernelPackages = pkgs.linuxPackages_latest_hardened;
initrd.luks.devices = [ initrd.luks.devices."crypt"=
{ {
name = "root";
device = "/dev/disk/by-uuid/962caed1-9dd5-4771-9a8f-3d3f5854af2e"; device = "/dev/disk/by-uuid/962caed1-9dd5-4771-9a8f-3d3f5854af2e";
preLVM = true; preLVM = true;
allowDiscards = true; allowDiscards = true;
}]; };
loader.grub = { loader.grub = {
device = "/dev/sda"; device = "/dev/sda";
}; };
@ -18,8 +17,8 @@
time.timeZone = "Europe/Warsaw"; time.timeZone = "Europe/Warsaw";
imports = [ imports = [
/etc/nixos/hardware-configuration.nix /etc/nixos/hardware-configuration.nix
../boot.nix ../../boot.nix
../common.nix ../../common.nix
../gfx-intel.nix ../../gfx-intel.nix
]; ];
} }