Add correct mount options for drives

3 files changed, 80 insertions, 48 deletions

diff --git a/hosts/kataja/hardware-configuration.nix b/hosts/kataja/hardware-configuration.nix
index cc56876..d8a3ea8 100644
--- a/hosts/kataja/hardware-configuration.nix
+++ b/hosts/kataja/hardware-configuration.nix
@@ -12,8 +12,12 @@
   boot = {
     kernelPackages = pkgs.linuxPackages_zen;
     initrd = {
-      luks.devices."luks-b3e9864c-2a40-43d7-b1a0-51f3b2ec42bc".device =
-        "/dev/disk/by-uuid/b3e9864c-2a40-43d7-b1a0-51f3b2ec42bc";
+      luks.devices = {
+        "luks-b3e9864c-2a40-43d7-b1a0-51f3b2ec42bc".device =
+          "/dev/disk/by-uuid/b3e9864c-2a40-43d7-b1a0-51f3b2ec42bc";
+        "luks-b9b738dc-8554-41d9-82f9-042663b52e79".device =
+          "/dev/disk/by-uuid/b9b738dc-8554-41d9-82f9-042663b52e79";
+      };
       availableKernelModules = [
         "ahci"
         "amdgpu"
@@ -44,21 +48,27 @@
     extraModulePackages = [ ];
   };
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/3e7f6b6b-b656-4f42-b314-f447e2562718";
-    fsType = "ext4";
-  };
-
-  boot.initrd.luks.devices."luks-b9b738dc-8554-41d9-82f9-042663b52e79".device =
-    "/dev/disk/by-uuid/b9b738dc-8554-41d9-82f9-042663b52e79";
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/4121-BEC3";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
-    ];
+  fileSystems = {
+    "/boot" = {
+      device = "/dev/disk/by-uuid/4121-BEC3";
+      fsType = "vfat";
+      options = [
+        "fmask=0077"
+        "dmask=0077"
+      ];
+    };
+    "/" = {
+      device = "/dev/disk/by-uuid/3e7f6b6b-b656-4f42-b314-f447e2562718";
+      fsType = "ext4";
+      options = [
+        "defaults"
+        "lazytime"
+        "nodiratime"
+        "barrier=1"
+        "errors=remount-ro"
+        "commit=30"
+      ];
+    };
   };
 
   swapDevices = [ { device = "/dev/disk/by-uuid/97641877-607c-46cd-853d-e431c8a90dc2"; } ];
diff --git a/hosts/pihlaja/hardware-configuration.nix b/hosts/pihlaja/hardware-configuration.nix
index d389063..3626e6d 100644
--- a/hosts/pihlaja/hardware-configuration.nix
+++ b/hosts/pihlaja/hardware-configuration.nix
@@ -45,28 +45,41 @@
     extraModulePackages = [ ];
   };
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/eecfd181-138c-4c90-add6-2ef528d5dbb4";
-    fsType = "ext4";
-  };
-
-  fileSystems."/data" = {
-    device = "/dev/disk/by-uuid/a02a4e78-32ea-40e6-8398-087bfd8dca93";
-    fsType = "ext4";
-    options = [ "nofail" ];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/A4F5-0899";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
-    ];
+  fileSystems = {
+    "/boot" = {
+      device = "/dev/disk/by-uuid/A4F5-0899";
+      fsType = "vfat";
+      options = [
+        "fmask=0077"
+        "dmask=0077"
+      ];
+    };
+    "/" = {
+      device = "/dev/disk/by-uuid/eecfd181-138c-4c90-add6-2ef528d5dbb4";
+      fsType = "ext4";
+      options = [
+        "defaults"
+        "lazytime"
+        "nodiratime"
+        "barrier=1"
+        "errors=remount-ro"
+        "commit=30"
+      ];
+    };
+    "/data" = {
+      device = "/dev/disk/by-uuid/a02a4e78-32ea-40e6-8398-087bfd8dca93";
+      fsType = "ext4";
+      options = [
+        "defaults"
+        "noatime"
+        "barrier=1"
+        "errors=remount-ro"
+        "commit=60"
+      ];
+    };
   };
 
   swapDevices = [ { device = "/dev/disk/by-uuid/d0e5a93d-18a7-4d24-893c-d2417c3d5043"; } ];
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/hosts/saarni/hardware-configuration.nix b/hosts/saarni/hardware-configuration.nix
index 27dd94a..8381267 100644
--- a/hosts/saarni/hardware-configuration.nix
+++ b/hosts/saarni/hardware-configuration.nix
@@ -46,18 +46,27 @@
     '';
   };
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/3968a07a-5e37-4bdb-9e3a-6c74950fd03d";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/9B7E-3D1B";
-    fsType = "vfat";
-    options = [
-      "fmask=0022"
-      "dmask=0022"
-    ];
+  fileSystems = {
+    "/boot" = {
+      device = "/dev/disk/by-uuid/9B7E-3D1B";
+      fsType = "vfat";
+      options = [
+        "fmask=0022"
+        "dmask=0022"
+      ];
+    };
+    "/" = {
+      device = "/dev/disk/by-uuid/3968a07a-5e37-4bdb-9e3a-6c74950fd03d";
+      fsType = "ext4";
+      options = [
+        "defaults"
+        "lazytime"
+        "nodiratime"
+        "barrier=1"
+        "errors=remount-ro"
+        "commit=30"
+      ];
+    };
   };
 
   hardware.firmware = [ pkgs.sof-firmware ];