diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-09-26 17:54:12 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-09-26 17:54:12 +0200 |
commit | 9051b6d6015a105cf532b245fd4db75ac6be0e98 (patch) | |
tree | a15a953f83de33b3d24ed5b7fc4f7ad70d9b9009 | |
parent | 387db74367f02365b8882c888b27e6008f19cdb8 (diff) | |
download | nixos-9051b6d6015a105cf532b245fd4db75ac6be0e98.tar nixos-9051b6d6015a105cf532b245fd4db75ac6be0e98.tar.gz nixos-9051b6d6015a105cf532b245fd4db75ac6be0e98.tar.bz2 nixos-9051b6d6015a105cf532b245fd4db75ac6be0e98.tar.xz nixos-9051b6d6015a105cf532b245fd4db75ac6be0e98.zip |
...
-rw-r--r-- | hel/boot.nix | 11 | ||||
-rw-r--r-- | hel/hw.nix | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/hel/boot.nix b/hel/boot.nix index b7cc0429..41452166 100644 --- a/hel/boot.nix +++ b/hel/boot.nix | |||
@@ -2,8 +2,15 @@ | |||
2 | 2 | ||
3 | { | 3 | { |
4 | boot = { | 4 | boot = { |
5 | initrd.luks.devices = [ { name = "ssd"; device = "/dev/disk/by-uuid/9e9e430c-f9cd-418e-b66b-60f81ba9293b"; } | 5 | initrd = { |
6 | ]; | 6 | luks.devices = [ { name = "ssd"; device = "/dev/disk/by-uuid/9e9e430c-f9cd-418e-b66b-60f81ba9293b"; } |
7 | ]; | ||
8 | availableKernelModules = [ "fbcon" "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; | ||
9 | }; | ||
10 | |||
11 | kernelModules = [ "kvm-intel" ]; | ||
12 | extraModulePackages = [ ]; | ||
13 | |||
7 | loader = { | 14 | loader = { |
8 | systemd-boot.enable = true; | 15 | systemd-boot.enable = true; |
9 | efi.canTouchEfiVariables = true; | 16 | efi.canTouchEfiVariables = true; |
@@ -5,10 +5,6 @@ | |||
5 | [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> | 5 | [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> |
6 | ]; | 6 | ]; |
7 | 7 | ||
8 | boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; | ||
9 | boot.kernelModules = [ "kvm-intel" ]; | ||
10 | boot.extraModulePackages = [ ]; | ||
11 | |||
12 | fileSystems."/" = | 8 | fileSystems."/" = |
13 | { device = "/dev/hel/btrfs"; | 9 | { device = "/dev/hel/btrfs"; |
14 | fsType = "btrfs"; | 10 | fsType = "btrfs"; |