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 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e2d0b455-76a2-4e57-aff0-98d1fc2f7806";
+    { 
+      device = "/dev/disk/by-label/ymir-root";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/6e0ba525-114b-4998-952f-c859cf1471d6";
+    { 
+      device = "/dev/disk/by-label/ymir-boot";
       fsType = "ext2";
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/4284cea9-9a3f-4ee3-8295-ebffa8f6622c";
+    { 
+      device = "/dev/disk/by-label/ymir-home";
       fsType = "ext4";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/7957964d-aa60-44c4-9c59-9ae21fbca985"; }
+    [ { device = "/dev/disk/by-label/ymir-swap"; }
     ];
 
   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 @@
       ./users.nix
     ];
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
+  boot.loader.grub = {
+    enable = true;
+    version = 2;
+    device = "/dev/disk/by-label/ymir-boot";
+  };
 
   networking.hostName = "ymir";
   networking.hostId = "1c5c994e";