Merge branch 'master' into issue31

machines/modules/disko/btrfs-laptop.nix

@@ -1,63 +0,0 @@
-{ config, self, inputs, ... }:
-
-{
-  imports = [
-    inputs.disko.nixosModules.disko
-  ];
-
-  # https://github.com/nix-community/disko/blob/master/example/luks-btrfs-subvolumes.nix
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        # When using disko-install, we will overwrite this value from the commandline
-        device = "/dev/disk/by-id/some-disk-id";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "512M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            luks = {
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "crypted";
-                passwordFile = /tmp/secret.key; # Interactive
-                content = {
-                  type = "btrfs";
-                  extraArgs = [ "-f" ];
-                  subvolumes = {
-                    "/root" = {
-                      mountpoint = "/";
-                      mountOptions = [ "compress=zstd" "noatime" ];
-                    };
-                    "/home" = {
-                      mountpoint = "/home";
-                      mountOptions = [ "compress=zstd" "noatime" ];
-                    };
-                    "/nix" = {
-                      mountpoint = "/nix";
-                      mountOptions = [ "compress=zstd" "noatime" ];
-                    };
-                    "/swap" = {
-                      mountpoint = "/.swapvol";
-                      swap.swapfile.size = "20M";
-                    };
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}

machines/modules/disko/default.nix

@@ -271,13 +271,12 @@ in
                 };
                 # use this to read the key during boot
                 postCreateHook = lib.mkIf cfg.encryption ''
-                  zfs set keylocation="prompt" storage/encrypted;
+                  zfs set keylocation="file:///root/secret.key" storage/encrypted;
                 '';
               };
               "encrypted/data" = {
                 type = "zfs_fs";
                 mountpoint = "/data";
-                options.mountpoint = "legacy";
               };
               reserved = {
                 # for cow delete if pool is full
@@ -294,10 +293,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."/var".neededForBoot = true;
+      fileSystems."/boot".neededForBoot = true;
       fileSystems."/home".neededForBoot = true;
       fileSystems."/nix".neededForBoot = true;
     })