diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-07-05 23:53:01 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-07-05 23:53:01 +0200 |
commit | 89a5be1f9b28a9309676d99383a51add3ef72266 (patch) | |
tree | 2b54ce64dec8d0289a0fe1a9bc14fff2a5aac37d | |
parent | 0c9991c6285b1ef557c5a53177aac263b325b26e (diff) | |
download | nixos-89a5be1f9b28a9309676d99383a51add3ef72266.tar nixos-89a5be1f9b28a9309676d99383a51add3ef72266.tar.gz nixos-89a5be1f9b28a9309676d99383a51add3ef72266.tar.bz2 nixos-89a5be1f9b28a9309676d99383a51add3ef72266.tar.xz nixos-89a5be1f9b28a9309676d99383a51add3ef72266.zip |
Moved mbr device definitions to section for hardware-dependent expressions
-rw-r--r-- | bragi-hw.nix | 1 | ||||
-rw-r--r-- | bragi.nix | 1 | ||||
-rw-r--r-- | vali-hw.nix | 1 | ||||
-rw-r--r-- | vali.nix | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/bragi-hw.nix b/bragi-hw.nix index 6a14ff09..ab424091 100644 --- a/bragi-hw.nix +++ b/bragi-hw.nix | |||
@@ -8,6 +8,7 @@ | |||
8 | boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "usb_storage" ]; | 8 | boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "usb_storage" ]; |
9 | boot.kernelModules = [ "kvm-amd" ]; | 9 | boot.kernelModules = [ "kvm-amd" ]; |
10 | boot.extraModulePackages = [ ]; | 10 | boot.extraModulePackages = [ ]; |
11 | boot.loader.grub.device = "/dev/disk/by-id/ata-Crucial_CT256M550SSD3_15010E5F81A6"; | ||
11 | 12 | ||
12 | fileSystems."/" = | 13 | fileSystems."/" = |
13 | { device = "/dev/disk/by-uuid/15fc072d-5fdf-4ec7-b029-50d09b4dc5ea"; | 14 | { device = "/dev/disk/by-uuid/15fc072d-5fdf-4ec7-b029-50d09b4dc5ea"; |
@@ -13,7 +13,6 @@ in { | |||
13 | 13 | ||
14 | boot.loader.grub.enable = true; | 14 | boot.loader.grub.enable = true; |
15 | boot.loader.grub.version = 2; | 15 | boot.loader.grub.version = 2; |
16 | boot.loader.grub.device = "/dev/disk/by-id/ata-Crucial_CT256M550SSD3_15010E5F81A6"; | ||
17 | 16 | ||
18 | boot.loader.grub.extraConfig = "serial; terminal_output.serial"; | 17 | boot.loader.grub.extraConfig = "serial; terminal_output.serial"; |
19 | boot.kernelParams = [ "console=ttyS0,115200" | 18 | boot.kernelParams = [ "console=ttyS0,115200" |
diff --git a/vali-hw.nix b/vali-hw.nix index 700c82ee..eb387a41 100644 --- a/vali-hw.nix +++ b/vali-hw.nix | |||
@@ -11,6 +11,7 @@ | |||
11 | boot.initrd.availableKernelModules = [ "ehci_pci" "ata_piix" "pata_marvell" "xhci_hcd" "firewire_ohci" "usb_storage" "usbhid" ]; | 11 | boot.initrd.availableKernelModules = [ "ehci_pci" "ata_piix" "pata_marvell" "xhci_hcd" "firewire_ohci" "usb_storage" "usbhid" ]; |
12 | boot.kernelModules = [ "kvm-intel" ]; | 12 | boot.kernelModules = [ "kvm-intel" ]; |
13 | boot.extraModulePackages = [ ]; | 13 | boot.extraModulePackages = [ ]; |
14 | boot.loader.grub.device = "/dev/disk/by-id/ata-ST3500630AS_9QG2V5B9"; | ||
14 | 15 | ||
15 | fileSystems."/" = | 16 | fileSystems."/" = |
16 | { device = "/dev/disk/by-uuid/2343160f-7abc-4233-8dac-3b42ad0fdadb"; | 17 | { device = "/dev/disk/by-uuid/2343160f-7abc-4233-8dac-3b42ad0fdadb"; |
@@ -15,8 +15,6 @@ rec { | |||
15 | # Use the GRUB 2 boot loader. | 15 | # Use the GRUB 2 boot loader. |
16 | boot.loader.grub.enable = true; | 16 | boot.loader.grub.enable = true; |
17 | boot.loader.grub.version = 2; | 17 | boot.loader.grub.version = 2; |
18 | # Define on which hard drive you want to install Grub. | ||
19 | boot.loader.grub.device = "/dev/disk/by-id/ata-ST3500630AS_9QG2V5B9"; | ||
20 | 18 | ||
21 | boot.loader.grub.extraEntriesBeforeNixOS = true; | 19 | boot.loader.grub.extraEntriesBeforeNixOS = true; |
22 | boot.loader.grub.extraEntries = '' | 20 | boot.loader.grub.extraEntries = '' |