[disko] rm duplicate filesystems entry

I don't know if the grub device is right

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;
+    enable = false;
-    authorizedKeys = sshKeys.admins;
-    ethernetDrivers = ["r8169"];
   };
 
   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,198 +86,220 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkMerge [
-    networking.hostId = cfg.hostId;
+    (lib.mkIf (cfg.enable && !cfg.legacy) {
-    disko.devices = {
+      boot = {
-      disk = lib.mkMerge [
+        loader.systemd-boot.enable = true;
-        {
+        loader.efi.canTouchEfiVariables = true;
-          ssd0 = lib.mkIf (cfg.root.disk0 != "") {
+        supportedFilesystems = [ "vfat" "zfs" ];
-            type = "disk";
+      };
-            device = "/dev/${cfg.root.disk0}";
+      fileSystems."/boot".neededForBoot = true;
-            content = {
+    })
-              type = "gpt";
+    (lib.mkIf (cfg.enable && cfg.legacy) {
-              partitions = {
+      boot.loader.grub = {
-                ESP = {
+        enable = lib.mkForce true;
-                  size = "1024M";
+        device = "/dev/${cfg.root.disk0}-part1";
-                  type = "EF00";
+        efiSupport = false;
-                  content = {
+        enableCryptodisk = cfg.encryption;
-                    type = "filesystem";
+        zfsSupport = true;
-                    format = "vfat";
+      };
-                    mountpoint = "/boot";
+    })
-                    mountOptions = [ "umask=0077" ];
+    (lib.mkIf cfg.enable {
+      networking.hostId = cfg.hostId;
+      disko.devices = {
+        disk = lib.mkMerge [
+          {
+            ssd0 = lib.mkIf (cfg.root.disk0 != "") {
+              type = "disk";
+              device = "/dev/${cfg.root.disk0}";
+              content = {
+                type = "gpt";
+                partitions = {
+                  ESP = lib.mkIf (!cfg.legacy) {
+                    size = "1024M";
+                    type = "EF00";
+                    content = {
+                      type = "filesystem";
+                      format = "vfat";
+                      mountpoint = "/boot";
+                      mountOptions = [ "umask=0077" ];
+                    };
                   };
-                };
+                  boot = lib.mkIf cfg.legacy {
-                encryptedSwap = {
+                    size = "1024M";
-                  size = cfg.root.swap;
+                    type = "EF02";
-                  content =  {
-                    type = "swap";
-                    randomEncryption = true;
                   };
-                };
+                  encryptedSwap = {
-                zfs = {
+                    size = cfg.root.swap;
-                  size = "100%";
+                    content =  {
-                  content = {
+                      type = "swap";
-                    type = "zfs";
+                      randomEncryption = true;
-                    pool = "zroot";
+                    };
                   };
-                };
+                  zfs = {
-              };
+                    size = "100%";
-            };
+                    content = {
-          };
+                      type = "zfs";
-          ssd1 = lib.mkIf (cfg.root.disk1 != "") {
+                      pool = "zroot";
-            type = "disk";
-            device = "/dev/${cfg.root.disk1}";
-            content = {
-              type = "gpt";
-              partitions = {
-                zfs = {
-                  size = "100%";
-                  content = {
-                    type = "zfs";
-                    pool = "zroot";
-                  };
-                };
-              };
-            };
-          };
-        }
-        (lib.mkIf cfg.storage.enable (
-          lib.mkMerge (
-            map (diskname: {
-              "${diskname}" = {
-                type = "disk";
-                device = "/dev/${diskname}";
-                content = {
-                  type = "gpt";
-                  partitions = {
-                    zfs = {
-                      size = "100%";
-                      content = {
-                        type = "zfs";
-                        pool = "storage";
-                      };
                     };
                   };
                 };
               };
-            }) cfg.storage.disks
+            };
-          )
+            ssd1 = lib.mkIf (cfg.root.disk1 != "") {
-        ))
+              type = "disk";
-      ];
+              device = "/dev/${cfg.root.disk1}";
+              content = {
+                type = "gpt";
+                partitions = {
+                  zfs = {
+                    size = "100%";
+                    content = {
+                      type = "zfs";
+                      pool = "zroot";
+                    };
+                  };
+                };
+              };
+            };
+          }
+          (lib.mkIf cfg.storage.enable (
+            lib.mkMerge (
+              map (diskname: {
+                "${diskname}" = {
+                  type = "disk";
+                  device = "/dev/${diskname}";
+                  content = {
+                    type = "gpt";
+                    partitions = {
+                      zfs = {
+                        size = "100%";
+                        content = {
+                          type = "zfs";
+                          pool = "storage";
+                        };
+                      };
+                    };
+                  };
+                };
+              }) cfg.storage.disks
+            )
+          ))
+        ];
 
-      zpool = {
+        zpool = {
-        zroot = {
+          zroot = {
-          type = "zpool";
+            type = "zpool";
-          mode = lib.mkIf cfg.root.mirror "mirror";
+            mode = lib.mkIf cfg.root.mirror "mirror";
-          # Workaround: cannot import 'zroot': I/O error in disko tests
+            # Workaround: cannot import 'zroot': I/O error in disko tests
-          options.cachefile = "none";
+            options.cachefile = "none";
-          rootFsOptions = {
+            rootFsOptions = {
-            mountpoint = "none";
+              mountpoint = "none";
-            xattr = "sa";         # für microvm virtiofs mount
+              xattr = "sa";         # für microvm virtiofs mount
-            acltype = "posixacl"; # für microvm virtiofs mount 
+              acltype = "posixacl"; # für microvm virtiofs mount 
-            compression = "zstd";
+              compression = "zstd";
-            "com.sun:auto-snapshot" = "false";
+              "com.sun:auto-snapshot" = "false";
+            };
+
+            datasets = {
+              encrypted = {
+                type = "zfs_fs";
+                options = {
+                  mountpoint = "none";
+                  encryption = lib.mkIf cfg.encryption "aes-256-gcm";
+                  keyformat = lib.mkIf cfg.encryption "passphrase";
+                  keylocation = lib.mkIf cfg.encryption "file:///tmp/secret.key";
+                };
+                # use this to read the key during boot
+                postCreateHook = lib.mkIf cfg.encryption ''
+                  zfs set keylocation="prompt" zroot/encrypted;
+                '';
+              };
+              "encrypted/root" = {
+                type = "zfs_fs";
+                mountpoint = "/";
+                options.mountpoint = "legacy";
+              };
+              "encrypted/var" = {
+                type = "zfs_fs";
+                mountpoint = "/var";
+                options.mountpoint = "legacy";
+              };
+              "encrypted/etc" = {
+                type = "zfs_fs";
+                mountpoint = "/etc";
+                options.mountpoint = "legacy";
+              };
+              "encrypted/home" = {
+                type = "zfs_fs";
+                mountpoint = "/home";
+                options.mountpoint = "legacy";
+              };
+              "encrypted/nix" = {
+                type = "zfs_fs";
+                mountpoint = "/nix";
+                options.mountpoint = "legacy";
+              };
+              reserved = {
+                # for cow delete if pool is full
+                options = {
+                  canmount = "off";
+                  mountpoint = "none";
+                  reservation = "${cfg.root.reservation}";
+                };
+                type = "zfs_fs";
+              };
+            };
           };
 
-          datasets = {
+          storage = lib.mkIf cfg.storage.enable {
-            encrypted = {
+            type = "zpool";
-              type = "zfs_fs";
+            mode = lib.mkIf (cfg.storage.mirror) "mirror";
-              options = {
+            rootFsOptions = { 
-                mountpoint = "none";
+              mountpoint = "none";
-                encryption = lib.mkIf cfg.encryption "aes-256-gcm";
+              xattr = "sa";         # für microvm virtiofs mount
-                keyformat = lib.mkIf cfg.encryption "passphrase";
+              acltype = "posixacl"; # für microvm virtiofs mount 
-                keylocation = lib.mkIf cfg.encryption "file:///tmp/secret.key";
+            };
+            datasets = {
+              encrypted = {
+                type = "zfs_fs";
+                options = {
+                  mountpoint = "none";
+                  encryption = lib.mkIf cfg.encryption "aes-256-gcm";
+                  keyformat = lib.mkIf cfg.encryption "passphrase";
+                  keylocation = lib.mkIf cfg.encryption "file:///tmp/secret.key";
+                };
+                # use this to read the key during boot
+                postCreateHook = lib.mkIf cfg.encryption ''
+                  zfs set keylocation="file:///root/secret.key" storage/encrypted;
+                '';
               };
-              # use this to read the key during boot
+              "encrypted/data" = {
-              postCreateHook = lib.mkIf cfg.encryption ''
+                type = "zfs_fs";
-                zfs set keylocation="prompt" zroot/encrypted;
+                mountpoint = "/data";
-              '';
-
-            };
-            "encrypted/root" = {
-              type = "zfs_fs";
-              mountpoint = "/";
-              options.mountpoint = "legacy";
-            };
-            "encrypted/var" = {
-              type = "zfs_fs";
-              mountpoint = "/var";
-              options.mountpoint = "legacy";
-            };
-            "encrypted/etc" = {
-              type = "zfs_fs";
-              mountpoint = "/etc";
-              options.mountpoint = "legacy";
-            };
-            "encrypted/home" = {
-              type = "zfs_fs";
-              mountpoint = "/home";
-              options.mountpoint = "legacy";
-            };
-            "encrypted/nix" = {
-              type = "zfs_fs";
-              mountpoint = "/nix";
-              options.mountpoint = "legacy";
-            };
-            reserved = {
-              # for cow delete if pool is full
-              options = {
-                canmount = "off";
-                mountpoint = "none";
-                reservation = "${cfg.root.reservation}";
               };
-              type = "zfs_fs";
+              reserved = {
-            };
+                # for cow delete if pool is full
-          };
+                options = {
-        };
+                  canmount = "off";
-
+                  mountpoint = "none";
-        storage = lib.mkIf cfg.storage.enable {
+                  reservation = "${cfg.storage.reservation}";
-          type = "zpool";
+                };
-          mode = lib.mkIf (cfg.storage.mirror) "mirror";
+                type = "zfs_fs";
-          rootFsOptions = { 
-            mountpoint = "none";
-            xattr = "sa";         # für microvm virtiofs mount
-            acltype = "posixacl"; # für microvm virtiofs mount 
-          };
-          datasets = {
-            encrypted = {
-              type = "zfs_fs";
-              options = {
-                mountpoint = "none";
-                encryption = lib.mkIf cfg.encryption "aes-256-gcm";
-                keyformat = lib.mkIf cfg.encryption "passphrase";
-                keylocation = lib.mkIf cfg.encryption "file:///tmp/secret.key";
               };
-              # use this to read the key during boot
-              postCreateHook = lib.mkIf cfg.encryption ''
-                zfs set keylocation="file:///root/secret.key" storage/encrypted;
-              '';
-            };
-            "encrypted/data" = {
-              type = "zfs_fs";
-              mountpoint = "/data";
-            };
-            reserved = {
-              # for cow delete if pool is full
-              options = {
-                canmount = "off";
-                mountpoint = "none";
-                reservation = "${cfg.storage.reservation}";
-              };
-              type = "zfs_fs";
             };
           };
         };
       };
-    };
 
-    boot.zfs.devNodes = lib.mkDefault cfg.devNodes;
+      boot.zfs.devNodes = lib.mkDefault cfg.devNodes;
-    boot.zfs.extraPools = lib.mkIf cfg.storage.enable [ "storage" ];
+      boot.zfs.extraPools = lib.mkIf cfg.storage.enable [ "storage" ];
-    fileSystems."/".neededForBoot = true;
+
-    fileSystems."/etc".neededForBoot = true;
+      fileSystems."/".neededForBoot = true;
-    fileSystems."/boot".neededForBoot = true;
+      fileSystems."/etc".neededForBoot = true;
-    fileSystems."/var".neededForBoot = true;
+      fileSystems."/var".neededForBoot = true;
-    fileSystems."/home".neededForBoot = true;
+      fileSystems."/home".neededForBoot = true;
-    fileSystems."/nix".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;
       };