refactor: cleanup disk config for skull and scrubber

wimpysworld · Mar 5, 2024 · ec60fc5 · ec60fc5
1 parent 69274e2
commit ec60fc5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/nixos/scrubber/disks.nix b/nixos/scrubber/disks.nix
@@ -1,18 +1,14 @@
-{ disks ? [ "/dev/vda" ], ... }:
-let
-  defaultBcachefsOpts = [ "defaults" "relatime" "nodiratime" ];
-in
-{
+_: {
   disko.devices = {
     disk = {
       vda = {
         type = "disk";
-        device = builtins.elemAt disks 0;
+        device = "/dev/vda";
         content = {
           type = "gpt";
           partitions = {
             ESP = {
-              size = "1024M";
+              size = "512M";
               type = "EF00";
               content = {
                 format = "vfat";
@@ -26,7 +22,7 @@ in
               content = {
                 extraArgs = [ "-f" ];
                 format = "bcachefs";
-                mountOptions = defaultBcachefsOpts;
+                mountOptions = [ "defaults" "relatime" "nodiratime" ];
                 mountpoint = "/";
                 type = "filesystem";
               };

diff --git a/nixos/skull/disks.nix b/nixos/skull/disks.nix
@@ -1,13 +1,9 @@
-{ disks ? [ "/dev/nvme0n1" "/dev/nvme1n1" ], ... }:
-let
-  defaultXfsOpts = [ "defaults" "relatime" "nodiratime" ];
-in
-{
+_: {
   disko.devices = {
     disk = {
       nvme0 = {
         type = "disk";
-        device = builtins.elemAt disks 0;
+        device = "/dev/nvme0n1";
         content = {
           type = "table";
           format = "gpt";
@@ -34,14 +30,14 @@ in
                 extraArgs = [ "-f" ];
                 format = "xfs";
                 mountpoint = "/";
-                mountOptions = defaultXfsOpts;
+                mountOptions = [ "defaults" "relatime" "nodiratime" ];
               };
             }];
         };
       };
       nvme1 = {
         type = "disk";
-        device = builtins.elemAt disks 1;
+        device = "/dev/nvme1n1";
         content = {
           type = "table";
           format = "gpt";