Fix disko setup: device override & partition layout (#52)

pdalpra · Oct 16, 2023 · 8aec671 · 8aec671
1 parent 302aaf4
commit 8aec671
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/lib/mk-nixos.nix b/lib/mk-nixos.nix
@@ -11,6 +11,8 @@ let
     nix.registry.nixpkgs.flake = nixpkgs;
   };
   machineRoot = ../system/machines + "/${name}";
+  specificConfig = machineRoot + /configuration.nix;
+  diskoConfig = import (machineRoot + /disks.nix) { };
 in
 nixpkgs.lib.nixosSystem {
   inherit system specialArgs;
@@ -20,7 +22,7 @@ nixpkgs.lib.nixosSystem {
     disko.nixosModules.disko
     ./cachix.nix
     ../system/configuration.nix
-    (machineRoot + /configuration.nix)
-    (machineRoot + /disks.nix)
+    specificConfig
+    diskoConfig
   ];
 }
diff --git a/system/machines/vm/disks.nix b/system/machines/vm/disks.nix
@@ -1,15 +1,19 @@
+{ disks ? [ "/dev/sda" ], ... }:
+let
+  mainDisk = builtins.elemAt disks 0;
+in
 {
   disko.devices = {
-    disk.sda = {
-      device = "/dev/sda";
+    disk.main = {
+      device = mainDisk;
       type = "disk";
       content = {
         type = "gpt";
         partitions = {
           ESP = {
             name = "ESP";
-            device = "/dev/disk/by-label/boot";
-            end = "512M";
+            type = "EF00";
+            size = "512M";
             content = {
               type = "filesystem";
               format = "vfat";
@@ -18,18 +22,14 @@
           };
           root = {
             name = "root";
-            device = "/dev/disk/by-label/nixos";
-            start = "512M";
-            end = "-10G";
+            end = "-2G";
             content = {
               type = "filesystem";
               format = "ext4";
               mountpoint = "/";
             };
           };
           swap = {
-            name = "swap";
-            device = "/dev/disk/by-label/swap";
             size = "100%";
             content = {
               type = "swap";