From b0a5fd91cd128d57e07e4888aca134febbdb092f Mon Sep 17 00:00:00 2001
From: ahtlon <atlan@ahtlon.de>
Date: Tue, 31 Dec 2024 03:18:37 +0100
Subject: [PATCH] fix my mistakes

---
 machines/configuration.nix         |  2 --
 machines/fanny/configuration.nix   | 17 +++++++++++++++--
 machines/modules/disko/default.nix |  7 ++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/machines/configuration.nix b/machines/configuration.nix
index c4ab6643..a55a370f 100644
--- a/machines/configuration.nix
+++ b/machines/configuration.nix
@@ -118,8 +118,6 @@ in
     specialArgs.inputs = inputs;
     modules = defaultModules ++ [
       ./fanny/configuration.nix
-      inputs.disko.nixosModules.disko
-      ./modules/disko/fanny.nix
     ];
   };
 
diff --git a/machines/fanny/configuration.nix b/machines/fanny/configuration.nix
index 7997d719..5964770e 100644
--- a/machines/fanny/configuration.nix
+++ b/machines/fanny/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ inputs, pkgs, ... }:
 
 {
   imports =
@@ -8,6 +8,8 @@
       ../modules/sshd.nix
       ../modules/minimal_tools.nix
       ../modules/autoupdate.nix
+      inputs.self.nixosModules.malobeo.initssh
+      inputs.self.nixosModules.malobeo.disko
     ];
 
   malobeo.autoUpdate = {
@@ -23,6 +25,18 @@
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
+  malobeo.disks = {
+    enable = true;
+    hostId = "1312acab";
+    root = {
+      disk0 = "sda";
+    };
+    storage = {
+      disks = ["sdb" "sdc"];
+      mirror = true;
+    };
+  };
+
   services.tor = {
     enable = true;
     client.enable = true;
@@ -34,7 +48,6 @@
   services.acpid.enable = true;
 
   networking.hostName = "fanny";
-  networking.hostId = "1312acab";
   networking.networkmanager.enable = true;
 
   virtualisation.vmVariant.virtualisation.graphics = false;
diff --git a/machines/modules/disko/default.nix b/machines/modules/disko/default.nix
index d11b6f4e..3c6adde0 100644
--- a/machines/modules/disko/default.nix
+++ b/machines/modules/disko/default.nix
@@ -1,8 +1,9 @@
-{config, lib, ...}:
+{config, lib, inputs, ...}:
 let 
   cfg = config.malobeo.disks;
 in
 {
+  imports = [inputs.disko.nixosModules.disko];
   options.malobeo.disks = {
     enable = lib.mkOption {
       type = lib.types.bool;
@@ -75,8 +76,8 @@ in
     };
   };
 
-  config = lib.mkif cfg.enable {
-    networking.hostId = cfg.zfs.hostId;
+  config = lib.mkIf cfg.enable {
+    networking.hostId = cfg.hostId;
     disko.devices = {
       disk = lib.mkMerge [
         {