nixos/lyratris: working image build

NixOS · Nov 24, 2024 · ac7ff3b · ac7ff3b
1 parent 76a7687
commit ac7ff3b
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 26 deletions.
diff --git a/nixos/modules/virtualisation/lyratris-config.nix b/nixos/modules/virtualisation/lyratris-config.nix
@@ -8,7 +8,7 @@ with lib;
 {
   imports = [ ../profiles/qemu-guest.nix ];
 
-  services.openssh = {
+   services.openssh = {
     enable = true;
 
     settings.PermitRootLogin = "prohibit-password";
@@ -19,12 +19,13 @@ with lib;
 
   fileSystems."/" = {
     fsType = "btrfs";
-    device = "/dev/vda2";
+    device = "/dev/disk/by-label/nixos";
     autoResize = true;
+    autoFormat = true;
   };
   fileSystems."/boot" = {
     fsType = "vfat";
-    device = "/dev/vda1";
+    device = "/dev/disk/by-label/bootNixos";
   };
 
   services.cloud-init.enable = lib.mkDefault true;

diff --git a/nixos/modules/virtualisation/lyratris-image.nix b/nixos/modules/virtualisation/lyratris-image.nix
@@ -7,44 +7,54 @@
 
 with lib;
 let
-  cfg = config.virtualisation.linodeImage;
-  defaultConfigFile = pkgs.writeText "configuration.nix" ''
-    _: {
-      imports = [
-        <nixpkgs/nixos/modules/virtualisation/lyratris-image.nix>
-      ];
-    }
-  '';
+  efiArch = pkgs.stdenv.hostPlatform.efiArch;
 in
 {
   imports = [
     ./lyratris-config.nix
-    ./disk-size-option.nix
-    "virtualisation"
-    "diskSize"
+    # ./disk-size-option.nix
+    ../image/repart.nix
   ];
 
   options.virtualisation.lyratrisImage.configFile = mkOption {
-    type = with types; nullOr str;
-    default = null;
+    type = types.path;
+    default = ./lyratris-config.nix;
     description = ''
       A path to a configuration file which will be placed at `/etc/nixos/configuration.nix`
       and be used when switching to a new configuration.
       If set to `null`, a default configuration is used, where the only import is
-      `<nixpkgs/nixos/modules/virtualisation/linode-image.nix>`
+      `<nixpkgs/nixos/modules/virtualisation/lyratris-image.nix>`
     '';
   };
 
-  config = {
-    system.build.lyratrisImage = import ../../lib/make-disk-image.nix {
-      name = "lyratris-image";
-      format = "qcow2-compressed";
-      partitionTableType = "none";
-      configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile;
-      inherit (config.virtualisation) diskSize;
-      inherit config lib pkgs;
+  config.image.repart = {
+    name = "lyratrisNixos";
+    seed = "310eaabc-d44a-4f6e-b9a2-5dd8558e4380";
+    # sectorSize = 4096;
+    partitions = {
+      "00-esp" = {
+        contents = {
+          "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source = "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
+          "/EFI/Linux/${config.system.boot.loader.ukiFile}".source = config.system.build.uki;
+        };
+        repartConfig = {
+          Type = "esp";
+          Format = "vfat";
+          Label = "nixosBoot";
+          SizeMinBytes = "2G";
+        };
+      };
+      "50-root" = {
+        storePaths = [ config.system.build.toplevel ];
+        stripNixStorePrefix = true;
+        repartConfig = {
+          Type = "root";
+          Format = "btrfs";
+          Label = "nixos";
+          Minimize = "guess";
+        };
+      };
     };
   };
-
   meta.maintainers = with maintainers; [ makuru ];
 }