update Puenktchen disko

flake.nix

@@ -2,24 +2,24 @@
   description = "A simple NixOS flake";
 
   inputs = {
+
     # NixOS official package source, using the nixos-23.11 branch here
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     hardware.url = "github:nixos/nixos-hardware";
 
+    # Declarative dotfile management
     home-manager = {
       url = "github:nix-community/home-manager/";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # Declarative partitioning and formatting
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-
-#    # Declarative partitioning and formatting
-#    disko = {
-#      url = "github:nix-community/disko";
-#      inputs.nixpkgs.follows = "nixpkgs";
-#    };
-#
 #    # Secrets management. See ./docs/secretsmgmt.md
 #    sops-nix = {
 #      url = "github:mic92/sops-nix";

hosts/Puenktchen/disko.nix

@@ -8,53 +8,43 @@
           type = "gpt";
           partitions = {
             ESP = {
+              priority = 1;
+              name = "ESP";
               size = "512M";
               type = "EF00";
               content = {
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/boot";
-                mountOptions = [
-                  "defaults"
-                ];
               };
             };
-            luks = {
+            root = {
               size = "100%";
-              content = {
-                type = "luks";
-                name = "crypted";
-                # disable settings.keyFile if you want to use interactive password entry
-                #passwordFile = "/tmp/secret.key"; # Interactive
-                settings = {
-                  allowDiscards = true;
-                  keyFile = "/tmp/secret.key";
-                };
-                additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
               content = {
                 type = "btrfs";
-                  extraArgs = [ "-f" ];
+                extraArgs = [ "-f" ]; # Override existing partition
+                # Subvolumes must set a mountpoint in order to be mounted,
+                # unless their parent is mounted
                 subvolumes = {
-                    "/root" = {
+                  # Subvolume name is different from mountpoint
+                  "/rootfs" = {
+                    mountOptions = [ "compress=zstd" "noatime" ];
                     mountpoint = "/";
-                      mountOptions = [ "compress=zstd" "noatime" ];
                   };
+                  # Subvolume name is the same as the mountpoint
                   "/home" = {
+                    mountOptions = [ "compress=zstd" "noatime" ];
                     mountpoint = "/home";
-                      mountOptions = [ "compress=zstd" "noatime" ];
                   };
+                  # Parent is not mounted so the mountpoint must be set
                   "/nix" = {
+                    mountOptions = [ "compress=zstd" "noatime" ];
                     mountpoint = "/nix";
-                      mountOptions = [ "compress=zstd" "noatime" ];
-                    };
-                    "/mnt/data" = {
-                      mountpoint = "/mnt/data";
-                      mountOptions = [ "compress=zstd" "noatime" ];
                   };
+                  # Subvolume for the swapfile
                   "/swap" = {
                     mountpoint = "/.swapvol";
-                      swap.swapfile.size = "20M";
+                    swap.swapfile.size = "40G";
-                    };
                   };
                 };
               };