summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-09-25 14:39:27 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-09-25 14:39:27 +0200
commit0d3e25a344ecc931b77e2ae97b83e16b078e0365 (patch)
tree25809209091e1e5b0e00846400bdda81a4ad07a9
parent71a85e3ee912ec332f4a74d270fbb781f008c1f1 (diff)
downloadnixos-0d3e25a344ecc931b77e2ae97b83e16b078e0365.tar
nixos-0d3e25a344ecc931b77e2ae97b83e16b078e0365.tar.gz
nixos-0d3e25a344ecc931b77e2ae97b83e16b078e0365.tar.bz2
nixos-0d3e25a344ecc931b77e2ae97b83e16b078e0365.tar.xz
nixos-0d3e25a344ecc931b77e2ae97b83e16b078e0365.zip
Switched to labels & grub boot device
-rw-r--r--ymir-hw.nix11
-rw-r--r--ymir.nix7
2 files changed, 12 insertions, 6 deletions
diff --git a/ymir-hw.nix b/ymir-hw.nix
index cbb0d307..3ddf1035 100644
--- a/ymir-hw.nix
+++ b/ymir-hw.nix
@@ -14,22 +14,25 @@
14 boot.extraModulePackages = [ ]; 14 boot.extraModulePackages = [ ];
15 15
16 fileSystems."/" = 16 fileSystems."/" =
17 { device = "/dev/disk/by-uuid/e2d0b455-76a2-4e57-aff0-98d1fc2f7806"; 17 {
18 device = "/dev/disk/by-label/ymir-root";
18 fsType = "ext4"; 19 fsType = "ext4";
19 }; 20 };
20 21
21 fileSystems."/boot" = 22 fileSystems."/boot" =
22 { device = "/dev/disk/by-uuid/6e0ba525-114b-4998-952f-c859cf1471d6"; 23 {
24 device = "/dev/disk/by-label/ymir-boot";
23 fsType = "ext2"; 25 fsType = "ext2";
24 }; 26 };
25 27
26 fileSystems."/home" = 28 fileSystems."/home" =
27 { device = "/dev/disk/by-uuid/4284cea9-9a3f-4ee3-8295-ebffa8f6622c"; 29 {
30 device = "/dev/disk/by-label/ymir-home";
28 fsType = "ext4"; 31 fsType = "ext4";
29 }; 32 };
30 33
31 swapDevices = 34 swapDevices =
32 [ { device = "/dev/disk/by-uuid/7957964d-aa60-44c4-9c59-9ae21fbca985"; } 35 [ { device = "/dev/disk/by-label/ymir-swap"; }
33 ]; 36 ];
34 37
35 nix.maxJobs = 2; 38 nix.maxJobs = 2;
diff --git a/ymir.nix b/ymir.nix
index e7b9b88c..a0c7e773 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -8,8 +8,11 @@
8 ./users.nix 8 ./users.nix
9 ]; 9 ];
10 10
11 boot.loader.grub.enable = true; 11 boot.loader.grub = {
12 boot.loader.grub.version = 2; 12 enable = true;
13 version = 2;
14 device = "/dev/disk/by-label/ymir-boot";
15 };
13 16
14 networking.hostName = "ymir"; 17 networking.hostName = "ymir";
15 networking.hostId = "1c5c994e"; 18 networking.hostId = "1c5c994e";