From 299f7ac111d9d9b577c66117cb04de16491e41cf Mon Sep 17 00:00:00 2001
From: twoneis <sanjay29@sapura.de>
Date: Mon, 6 May 2024 19:16:33 +0200
Subject: [PATCH] added fixes from flake check

---
 devices/ellaca/default.nix |  1 +
 devices/ellaca/disko.nix   | 74 +++++++++++++++++++-------------------
 flake.lock                 | 21 +++++++++++
 3 files changed, 59 insertions(+), 37 deletions(-)

diff --git a/devices/ellaca/default.nix b/devices/ellaca/default.nix
index 8203bf7..deae7d9 100644
--- a/devices/ellaca/default.nix
+++ b/devices/ellaca/default.nix
@@ -7,6 +7,7 @@
   ];
 
   networking.hostName = "ellaca";
+  networking.hostId = "656c6c61";
 
   # Select kernel version
   boot.kernelPackages = pkgs.linuxPackages_zen;
diff --git a/devices/ellaca/disko.nix b/devices/ellaca/disko.nix
index a74ea4a..bca860b 100644
--- a/devices/ellaca/disko.nix
+++ b/devices/ellaca/disko.nix
@@ -58,47 +58,47 @@
           };
         };
       };
-      zpool = {
-        zroot = {
-          type = "zpool";
-          mode = "";
-          rootFsOptions = {
-            compression = "zstd";
-            canmount = "off";
-            "com.sun:auto-snapshot" = "false";
-          };
-          postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank";
+    };
+    zpool = {
+      zroot = {
+        type = "zpool";
+        mode = "";
+        rootFsOptions = {
+          compression = "zstd";
+          canmount = "off";
+          "com.sun:auto-snapshot" = "false";
+        };
+        postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank";
 
-          datasets = {
-            root = {
-              type = "zfs_fs";
-              mountpoint = "/";
-            };
-            nix = {
-              type = "zfs_fs";
-              mountpoint = "/nix";
-            };
-            persist = {
-              type = "zfs_fs";
-              mountpoint = "/persist";
-            };
+        datasets = {
+          root = {
+            type = "zfs_fs";
+            mountpoint = "/";
+          };
+          nix = {
+            type = "zfs_fs";
+            mountpoint = "/nix";
+          };
+          persist = {
+            type = "zfs_fs";
+            mountpoint = "/persist";
           };
         };
-        zstore = {
-          type = "zpool";
-          mode = "";
-          rootFsOptions = {
-            compression = "zstd";
-            canmount = "off";
-            "com.sun:auto-snapshot" = "false";
-          };
-          postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank";
+      };
+      zstore = {
+        type = "zpool";
+        mode = "";
+        rootFsOptions = {
+          compression = "zstd";
+          canmount = "off";
+          "com.sun:auto-snapshot" = "false";
+        };
+        postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank";
 
-          datasets = {
-            persist = {
-              type = "zfs_fs";
-              mountpoint = "/persist/ext";
-            };
+        datasets = {
+          persist = {
+            type = "zfs_fs";
+            mountpoint = "/persist/ext";
           };
         };
       };
diff --git a/flake.lock b/flake.lock
index 076add5..4f932b8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -98,6 +98,26 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1714959124,
+        "narHash": "sha256-oYmauPDpSgWjY9hvzwd815igGfP8Ds5Bk6bTo5JrBRk=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "e1b3ae2b4ebc3c7b83154b9361e3d154e64e362d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "locked": {
         "lastModified": 1696426674,
@@ -463,6 +483,7 @@
     },
     "root": {
       "inputs": {
+        "disko": "disko",
         "home-manager": "home-manager",
         "niri": "niri",
         "nixos-hardware": "nixos-hardware",