hosts/swan/default.nix

@@ -10,7 +10,6 @@ nixpkgs.lib.nixosSystem {
   specialArgs = { };
   modules = [
     ./hardware-configuration.nix
-    ./disks.nix
     ../../modules/common
     ../../modules/nixos
     (removeAttrs globals [ "mail.server" ])
@@ -18,6 +17,7 @@ nixpkgs.lib.nixosSystem {
     home-manager.nixosModules.home-manager
     disko.nixosModules.disko
     {
+      disko.devices = import ./disks.nix;
       server = true;
       gui.enable = false;
       theme = { colors = (import ../../colorscheme/gruvbox).dark; };

hosts/swan/disks.nix

@@ -1,6 +1,4 @@
-{ ... }: {
-  disko.enableConfig = false;
-  disko.devices = {
+{
   disk = {
     boot = {
       type = "disk";
@@ -20,7 +18,6 @@
               type = "filesystem";
               format = "vfat";
               mountpoint = "/boot";
-                extraArgs = [ "-n boot" ];
             };
           }
           {
@@ -34,7 +31,6 @@
               type = "filesystem";
               format = "ext4";
               mountpoint = "/";
-                extraArgs = [ "-L nixos" ];
             };
           }
         ];
@@ -102,14 +98,14 @@
       rootFsOptions = {
         compression = "on"; # lz4 by default
         "com.sun:auto-snapshot" = "false";
-          ashift = "12";
+        ashift = 12;
       };
       # mountpoint = "/";
 
       datasets = {
         media = {
           zfs_type = "filesystem";
-            mountpoint = "/media";
+          mountpoint = "none";
           options."com.sun:auto-snapshot" = "false";
         };
         # "media/movies" = {
@@ -168,5 +164,4 @@
       };
     };
   };
-  };
 }