From e48118b3ef83610ab0e3ef77b50f14ac89185af1 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Fri, 13 Dec 2024 19:10:12 -0500
Subject: [PATCH] disko ig

---
 etcnixos/hardware_laptop.nix | 61 +++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/etcnixos/hardware_laptop.nix b/etcnixos/hardware_laptop.nix
index 0a492ea..6e38cc2 100644
--- a/etcnixos/hardware_laptop.nix
+++ b/etcnixos/hardware_laptop.nix
@@ -15,25 +15,48 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/acbd96e3-e7c7-442d-82cc-ce2913a9e90c";
-    fsType = "btrfs";
-    options = [
-      "subvol=@"
-      "compress=zstd"
-      "autodefrag"
-      "noatime"
-      "space_cache=v2"
-      "discard"
-    ];
-  };
-
-  boot.initrd.luks.devices."luks-0f481d5f-528c-4838-bd8a-d2780b4ba234".device =
-    "/dev/disk/by-uuid/0f481d5f-528c-4838-bd8a-d2780b4ba234";
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/4D19-520E";
-    fsType = "vfat";
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = "/dev/disk/by-path/pci-0000:01:00.0-nvme-1";
+        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 = "/etc/secrets/primary-password";
+                content = {
+                  type = "filesystem";
+                  format = "f2fs";
+                  mountpoint = "/";
+                  extraArgs = [
+                    "-O"
+                    "extra_attr,inode_checksum,sb_checksum,compression"
+                  ];
+                  mountOptions = [
+                    "compress_algorithm=zstd:6,compress_chksum,atgc,gc_merge,lazytime,nodiscard"
+                  ];
+                };
+              };
+            };
+          };
+        };
+      };
+    };
   };
 
   swapDevices = [ ];