From d7e6ab7071647a4237739d514aa564f8c9e2a283 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sun, 4 Dec 2022 20:31:15 +0100
Subject: [PATCH] fix: zpool definition error

---
 make-honey.nix                     |  2 +-
 nix/home/colmenaConfigurations.nix |  2 +-
 nix/home/diskoConfigurations.nix   | 84 +++++++++++++++---------------
 nix/home/nixosConfigurations.nix   |  1 -
 pasteurize.nix                     |  2 +-
 5 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/make-honey.nix b/make-honey.nix
index fe3e846..8b84a9d 100644
--- a/make-honey.nix
+++ b/make-honey.nix
@@ -36,7 +36,7 @@ in
       evalSelected = names: l.filterAttrs (name: _: l.elem name names) this.toplevel;
       evalSelectedDrvPaths = names: l.mapAttrs (_: v: v.drvPath) (this.evalSelected names);
       metaConfig = {
-        name = "divnix/hive";
+        name = "oddlama/infranix";
         inherit (import ./flake.nix) description;
         machinesFile = null;
         allowApplyAll = false;
diff --git a/nix/home/colmenaConfigurations.nix b/nix/home/colmenaConfigurations.nix
index e32c9c7..ea0139b 100644
--- a/nix/home/colmenaConfigurations.nix
+++ b/nix/home/colmenaConfigurations.nix
@@ -3,7 +3,7 @@
     networking.hostName = "nom";
     deployment = {
       allowLocalDeployment = true;
-      targetHost = null;
+      targetHost = "192.168.1.183";
     };
     imports = [cell.nixosConfigurations.nom];
   };
diff --git a/nix/home/diskoConfigurations.nix b/nix/home/diskoConfigurations.nix
index a8b1435..1ff831a 100644
--- a/nix/home/diskoConfigurations.nix
+++ b/nix/home/diskoConfigurations.nix
@@ -11,7 +11,7 @@
             {
               type = "partition";
               name = "efi";
-              start = "0";
+              start = "2048";
               end = "8GiB";
               fs-type = "fat32";
               content = {
@@ -38,51 +38,53 @@
         device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5GXNX1T325329W";
         content = {
           type = "zfs";
-          pool = "zpool";
+          pool = "rpool";
         };
       };
     };
-    rpool = {
-      type = "zpool";
-      mode = "mirror";
-      rootFsOptions = {
-        compression = "zstd";
-        acltype = "posix";
-        atime = "off";
-        xattr = "sa";
-        dnodesize = "auto";
-        mountpoint = "none";
-        canmount = "off";
-        devices = "off";
-        encryption = "aes-256-gcm";
-        keyformat = "passphrase";
-        keylocation = "prompt";
-        "autobackup:snap" = "true";
-        "autobackup:home" = "true";
-      };
-      options = {
-        ashift = "12";
-        bootfs = "rpool/root/nixos";
-      };
-      datasets = {
-        "root" = {
-          zfs_type = "filesystem";
+    zpool = {
+      rpool = {
+        type = "zpool";
+        mode = "mirror";
+        rootFsOptions = {
+          compression = "zstd";
+          acltype = "posix";
+          atime = "off";
+          xattr = "sa";
+          dnodesize = "auto";
+          mountpoint = "none";
+          canmount = "off";
+          devices = "off";
+          encryption = "aes-256-gcm";
+          keyformat = "passphrase";
+          keylocation = "prompt";
+          "autobackup:snap" = "true";
+          "autobackup:home" = "true";
         };
-        "root/nixos" = {
-          zfs_type = "filesystem";
-          options = {
-            canmount = "on";
-            mountpoint = "/";
+        options = {
+          ashift = "12";
+          bootfs = "rpool/root/nixos";
+        };
+        datasets = {
+          "root" = {
+            zfs_type = "filesystem";
           };
-        };
-        "home" = {
-          zfs_type = "filesystem";
-        };
-        "home/root" = {
-          zfs_type = "filesystem";
-          options = {
-            canmount = "on";
-            mountpoint = "/root";
+          "root/nixos" = {
+            zfs_type = "filesystem";
+            options = {
+              canmount = "on";
+              mountpoint = "/";
+            };
+          };
+          "home" = {
+            zfs_type = "filesystem";
+          };
+          "home/root" = {
+            zfs_type = "filesystem";
+            options = {
+              canmount = "on";
+              mountpoint = "/root";
+            };
           };
         };
       };
diff --git a/nix/home/nixosConfigurations.nix b/nix/home/nixosConfigurations.nix
index d25392a..0a156ef 100644
--- a/nix/home/nixosConfigurations.nix
+++ b/nix/home/nixosConfigurations.nix
@@ -33,7 +33,6 @@
       accept-flake-config = true;
     };
 
-    networking.hostName = "nom";
     time.timeZone = "Europe/Berlin";
 
     # Select internationalisation properties.
diff --git a/pasteurize.nix b/pasteurize.nix
index 79f5682..6ffd9b9 100644
--- a/pasteurize.nix
+++ b/pasteurize.nix
@@ -81,7 +81,7 @@
     };
 
   checkAndTransformConfigFor = site: target: out: config: let
-    _file = "github:divnix/hive: ./comb/${site}; target: ${target}";
+    _file = "github:oddlama/infranix: ./nix/${site}; target: ${target}";
     locatedConfig = {
       imports = [config];
       inherit _file;