Disk silliness

disko/default.nix

@@ -103,7 +103,15 @@ in rec {
     };
   };
 
-  standard = {disk, ...}: {
+  standard = {
+    esp ? {
+      label = "ESP";
+      size = "4G";
+      name = "ESP";
+    },
+    disk,
+    ...
+  }: {
     # this is my standard partitioning scheme for my machines: an LUKS-encrypted
     # btrfs volume
     disko.devices = {
@@ -114,7 +122,7 @@ in rec {
           content = {
             type = "gpt";
             partitions = {
-              ESP = ESP {size = "4G";};
+              ESP = ESP esp;
               luks = {
                 size = "100%";
                 content = {
@@ -152,6 +160,15 @@ in rec {
     };
   };
 
+  thablet = standard {
+    disk = "nvme0n1";
+    esp = {
+      label = "EFI";
+      size = "4G";
+      name = "EFI";
+    };
+  };
+
   unencrypted = {disk, ...}: {
     disko.devices = {
       disk = {

flake.lock

@@ -156,11 +156,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1726560853,
+        "lastModified": 1705309234,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
@@ -171,7 +171,7 @@
     },
     "flake-utils_3": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1726560853,
@@ -376,18 +376,10 @@
     "helix": {
       "inputs": {
         "crane": "crane",
-<<<<<<< HEAD
+        "flake-utils": "flake-utils_2",
-        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs-unstable"
         ],
-||||||| b4bc4ce
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
-=======
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs",
->>>>>>> origin/main
         "rust-overlay": "rust-overlay"
       },
       "locked": {
@@ -693,7 +685,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1727632156,
@@ -1057,7 +1049,7 @@
         "type": "github"
       }
     },
-    "systems_4": {
+    "systems_5": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

flake.nix

@@ -535,7 +535,7 @@
         system = "x86_64-linux";
         modules = with nixosModules; [
           home-manager-unstable-defaults
-          outputs.diskoConfigurations.standard
+          outputs.diskoConfigurations.thablet
           hardware.nixosModules.lenovo-thinkpad-x1-yoga
 
           common