machines/bakunin/configuration.nix

@@ -26,6 +26,7 @@ in
 
   malobeo.disks = {
     enable = true;
+    legacy = true;
     hostId = "a3c3102f";
     root = {
       disk0 = "disk/by-id/ata-HITACHI_HTS725016A9A364_110308PCKB04VNHX9XTJ";
@@ -33,9 +34,7 @@ in
   };
 
   malobeo.initssh = {
-    enable = true;
-    authorizedKeys = sshKeys.admins;
-    ethernetDrivers = ["r8169"];
+    enable = false;
   };
 
   hardware.sane.enable = true; #scanner support

machines/modules/disko/default.nix

@@ -20,6 +20,11 @@ in
       default = true;
       description = "Allows encryption to be disabled for testing";
     };
+    legacy = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Enable legacy boot (bios)";
+    };
     devNodes = lib.mkOption {
       type = lib.types.str;
       default = "/dev/disk/by-id/";
@@ -81,7 +86,25 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.enable && !cfg.legacy) {
+      boot = {
+        loader.systemd-boot.enable = true;
+        loader.efi.canTouchEfiVariables = true;
+        supportedFilesystems = [ "vfat" "zfs" ];
+      };
+      fileSystems."/boot".neededForBoot = true;
+    })
+    (lib.mkIf (cfg.enable && cfg.legacy) {
+      boot.loader.grub = {
+        enable = lib.mkForce true;
+        device = "/dev/${cfg.root.disk0}-part1";
+        efiSupport = false;
+        enableCryptodisk = cfg.encryption;
+        zfsSupport = true;
+      };
+    })
+    (lib.mkIf cfg.enable {
       networking.hostId = cfg.hostId;
       disko.devices = {
         disk = lib.mkMerge [
@@ -92,7 +115,7 @@ in
               content = {
                 type = "gpt";
                 partitions = {
-                ESP = {
+                  ESP = lib.mkIf (!cfg.legacy) {
                     size = "1024M";
                     type = "EF00";
                     content = {
@@ -102,6 +125,10 @@ in
                       mountOptions = [ "umask=0077" ];
                     };
                   };
+                  boot = lib.mkIf cfg.legacy {
+                    size = "1024M";
+                    type = "EF02";
+                  };
                   encryptedSwap = {
                     size = cfg.root.swap;
                     content =  {
@@ -187,7 +214,6 @@ in
                 postCreateHook = lib.mkIf cfg.encryption ''
                   zfs set keylocation="prompt" zroot/encrypted;
                 '';
-
               };
               "encrypted/root" = {
                 type = "zfs_fs";
@@ -268,11 +294,12 @@ in
 
       boot.zfs.devNodes = lib.mkDefault cfg.devNodes;
       boot.zfs.extraPools = lib.mkIf cfg.storage.enable [ "storage" ];
+
       fileSystems."/".neededForBoot = true;
       fileSystems."/etc".neededForBoot = true;
-    fileSystems."/boot".neededForBoot = true;
       fileSystems."/var".neededForBoot = true;
       fileSystems."/home".neededForBoot = true;
       fileSystems."/nix".neededForBoot = true;
-  };
+    })
+  ];
 }

machines/modules/malobeo/initssh.nix

@@ -26,9 +26,6 @@ in
   
   config = lib.mkIf (cfg.enable && config.malobeo.disks.encryption) {
     boot = {
-      loader.systemd-boot.enable = true;
-      loader.efi.canTouchEfiVariables = true;
-      supportedFilesystems = [ "vfat" "zfs" ];
       zfs = {
         requestEncryptionCredentials = true;
       };