Working boot on x220

2 files changed, 36 insertions, 38 deletions

diff --git a/machines/x220/default.nix b/machines/x220/default.nix
index a4914ca..4fac58f 100644
--- a/machines/x220/default.nix
+++ b/machines/x220/default.nix
@@ -48,37 +48,37 @@
 	];
 
 	fileSystems."/persist".neededForBoot = true;
-	environment.persistence."/persistent" = {
-    enable = true;  # NB: Defaults to true, not needed
-    hideMounts = true;
-    directories = [
-      "/var/log"
-      "/var/lib/bluetooth"
-      "/var/lib/nixos"
-      "/var/lib/systemd/coredump"
-      "/etc/NetworkManager/system-connections"
-      { directory = "/var/lib/colord"; user = "colord"; group = "colord"; mode = "u=rwx,g=rx,o="; }
-    ];
-    files = [
-      "/etc/machine-id"
-	"/etc/shadow"
-      { file = "/var/keys/secret_file"; parentDirectory = { mode = "u=rwx,g=,o="; }; }
-    ];
-    users.pn = {
-      directories = [
-        "Downloads"
-        "Music"
-        "Pictures"
-        "Documents"
-        "Videos"
-        "VirtualBox VMs"
-        { directory = ".gnupg"; mode = "0700"; }
-        { directory = ".ssh"; mode = "0700"; }
-        { directory = ".local/share/keyrings"; mode = "0700"; }
-        ".local/share/direnv"
-      ];
-    };
-  };
+	#environment.persistence."/persistent" = {
+    #enable = true;  # NB: Defaults to true, not needed
+    #hideMounts = true;
+    #directories = [
+      #"/var/log"
+      #"/var/lib/bluetooth"
+      #"/var/lib/nixos"
+      #"/var/lib/systemd/coredump"
+      #"/etc/NetworkManager/system-connections"
+      #{ directory = "/var/lib/colord"; user = "colord"; group = "colord"; mode = "u=rwx,g=rx,o="; }
+    #];
+    #files = [
+      #"/etc/machine-id"
+	#"/etc/shadow"
+      #{ file = "/var/keys/secret_file"; parentDirectory = { mode = "u=rwx,g=,o="; }; }
+    #];
+    #users.pn = {
+      #directories = [
+        #"Downloads"
+        #"Music"
+        #"Pictures"
+        #"Documents"
+        #"Videos"
+        #"VirtualBox VMs"
+        #{ directory = ".gnupg"; mode = "0700"; }
+        #{ directory = ".ssh"; mode = "0700"; }
+        #{ directory = ".local/share/keyrings"; mode = "0700"; }
+        #".local/share/direnv"
+      #];
+    #};
+  #};
 
 # Some programs need SUID wrappers, can be configured further or are
 # started in user sessions.
diff --git a/machines/x220/disko.nix b/machines/x220/disko.nix
index 714cafa..c8f4ae4 100644
--- a/machines/x220/disko.nix
+++ b/machines/x220/disko.nix
@@ -9,19 +9,17 @@
       content = {
         type = "gpt";
         partitions = {
-          boot = {
-            name = "boot";
-            size = "1M";
-            type = "EF02";
-          };
-          esp = {
+          ESP = {
+            priority = 1;
             name = "ESP";
-            size = "500M";
+            start = "1M";
+            end = "256M";
             type = "EF00";
             content = {
               type = "filesystem";
               format = "vfat";
               mountpoint = "/boot";
+              mountOptions = [ "umask=0077" ];
             };
           };
           swap = {