2 files changed, 26 insertions, 6 deletions

diff --git a/ymir.nix b/ymir.nix
index e12d32bf..9feb4393 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -38,6 +38,9 @@ in rec {
       ./utils/nix/module.nix
     ];
 
+  networking.hostId = "34f0d2df";
+  environment.etc."machine-id".text = "34f0d2df31f8634d8c08d47b15419d26";
+
   boot.loader.grub = {
     enable = true;
     version = 2;
@@ -1024,6 +1027,7 @@ in rec {
 
   security.dhparams = {
     enable = true;
+    stateful = false;
     params = {
       nginx.bits = 3072;
       "postfix-512".bits = 512;
diff --git a/ymir/hw.nix b/ymir/hw.nix
index 3ddf1035..a208e114 100644
--- a/ymir/hw.nix
+++ b/ymir/hw.nix
@@ -15,25 +15,41 @@
 
   fileSystems."/" =
     { 
-      device = "/dev/disk/by-label/ymir-root";
+      label = "ymir-root";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
     { 
-      device = "/dev/disk/by-label/ymir-boot";
+      label = "ymir-boot";
       fsType = "ext2";
     };
 
   fileSystems."/home" =
     { 
-      device = "/dev/disk/by-label/ymir-home";
+      label = "ymir-home";
+      fsType = "ext4";
+    };
+  
+  fileSystems."/nix" =
+    { 
+      label = "ymir-nix";
       fsType = "ext4";
     };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-label/ymir-swap"; }
-    ];
+  fileSystems."/root" =
+    { 
+      label = "ymir-home--root";
+      fsType = "ext4";
+    };
+
+  fileSystems."/srv" =
+    { 
+      label = "ymir-srv";
+      fsType = "ext4";
+    };
+
+  swapDevices = [];
 
   nix.maxJobs = 2;
 }