switched mount points on gerg-desktop

systems/game-laptop/default.nix

@@ -7,10 +7,11 @@ inputs: {
 }: {
   imports = [
     (import ./prime.nix inputs)
-    (import ./disko.nix inputs)
     (import ./gaming.nix inputs)
   ];
 
+  disko.devices = import ./disko.nix;
+
   localModules = {
     DE.gnome.enable = true;
     DM = {

systems/game-laptop/disko.nix

@@ -1,5 +1,4 @@
 _: {
-  disko.devices = {
   disk.nvme0n1 = {
     device = "/dev/disk/by-id/nvme-WDC_PC_SN530_SDBPNPZ-512G-1006_21311N802456";
     type = "disk";
@@ -35,5 +34,4 @@ _: {
       ];
     };
   };
-  };
 }

systems/gerg-desktop/default.nix

@@ -12,9 +12,10 @@ inputs: {
     (import ./spicetify.nix inputs)
     (import ./zfs.nix inputs)
     (import ./containers inputs)
-    (import ./disko.nix inputs)
   ];
 
+  disko.devices = import ./disko.nix;
+
   system.stateVersion = "unstable";
   localModules = {
     X11Programs = {

systems/gerg-desktop/disko.nix

@@ -1,5 +1,4 @@
 _: {
-  disko.devices = {
   disk = {
     nvme0 = {
       type = "disk";
@@ -128,53 +127,48 @@ _: {
       mode = "mirror";
       rootFsOptions = {
         acltype = "posixacl";
-          canmount = "off";
         compression = "zstd";
         dnodesize = "auto";
         normalization = "formD";
-          relatime = "true";
+        relatime = "on";
         xattr = "sa";
+        canmount = "off";
+        encryption = "on";
+        keyformat = "passphrase";
+        keylocation = "prompt";
       };
       options = {
         ashift = "12";
         autotrim = "on";
       };
       datasets = {
-          "nixos" = {
-            zfs_type = "filesystem";
-            options = {
-              canmount = "off";
-              encryption = "on";
-              keyformat = "passphrase";
-              keylocation = "prompt";
-            };
-          };
-
-          "nixos/root" = {
+        "root" = {
           zfs_type = "filesystem";
           options.mountpoint = "legacy";
           mountpoint = "/";
         };
-
-          "nixos/home" = {
+        "root/nix" = {
           zfs_type = "filesystem";
           options.mountpoint = "legacy";
-            mountpoint = "/home";
+          mountpoint = "/nix";
         };
-          "nixos/var" = {
+        "root/var" = {
           zfs_type = "filesystem";
+
           options.mountpoint = "legacy";
           mountpoint = "/var";
         };
-          "nixos/var/log" = {
+        "root/persist" = {
           zfs_type = "filesystem";
+
           options.mountpoint = "legacy";
-            mountpoint = "/var/log";
+          mountpoint = "/persist";
         };
-          "nixos/var/lib" = {
+        "root/home" = {
           zfs_type = "filesystem";
+
           options.mountpoint = "legacy";
-            mountpoint = "/var/lib";
+          mountpoint = "/home";
         };
       };
     };
@@ -183,13 +177,12 @@ _: {
       mode = "mirror";
       rootFsOptions = {
         acltype = "posixacl";
-          canmount = "off";
         compression = "lz4";
         devices = "off";
         normalization = "formD";
         relatime = "on";
         xattr = "sa";
-          mountpoint = "/boot";
+        canmount = "off";
       };
 
       options = {
@@ -198,7 +191,7 @@ _: {
         autotrim = "on";
       };
       datasets = {
-          "nixos/root" = {
+        "boot" = {
           zfs_type = "filesystem";
           options.mountpoint = "legacy";
           mountpoint = "/boot";
@@ -206,5 +199,4 @@ _: {
       };
     };
   };
-  };
 }

systems/moms-laptop/default.nix

@@ -6,8 +6,10 @@ inputs: {
 }: {
   imports = [
     (import ./printing.nix inputs)
-    (import ./disko.nix inputs)
   ];
+
+  disko.devices = import ./disko.nix;
+
   localModules = {
     DM = {
       lightdm.enable = true;

systems/moms-laptop/disko.nix

@@ -1,5 +1,4 @@
 _: {
-  disko.devices = {
   disk.sda = {
     device = "/dev/disk/by-id/ata-WDC_WDS240G2G0A-00JH30_180936803144";
     type = "disk";
@@ -35,5 +34,4 @@ _: {
       ];
     };
   };
-  };
 }