From 06f1990997642c8468c687414d997e614ef1b554 Mon Sep 17 00:00:00 2001
From: Bun <bun@nixfox.ca>
Date: Fri, 4 Apr 2025 13:42:40 -0400
Subject: [PATCH] Simplify Midas and move virtual raid config to system wide
 filesystems conf

---
 hosts/midas/boot/default.nix                         |  4 ----
 hosts/midas/filesystems/default.nix                  |  2 +-
 hosts/midas/firewall/default.nix                     |  2 +-
 hosts/midas/hardware/default.nix                     |  4 +---
 modules/system/devices/disks/filesystems/default.nix | 12 +++++++++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/hosts/midas/boot/default.nix b/hosts/midas/boot/default.nix
index f708dafb..b0ebebe2 100644
--- a/hosts/midas/boot/default.nix
+++ b/hosts/midas/boot/default.nix
@@ -2,10 +2,6 @@
 {
   boot = {
     kernelPackages = pkgs.linuxPackages_hardened;
-    swraid = {
-      enable = true;
-      mdadmConf = "MAILADDR contact@nixfox.ca";
-    };
     lanzaboote.enable = true;
   };
 }
diff --git a/hosts/midas/filesystems/default.nix b/hosts/midas/filesystems/default.nix
index 4a622e7e..86a0ebc5 100644
--- a/hosts/midas/filesystems/default.nix
+++ b/hosts/midas/filesystems/default.nix
@@ -8,7 +8,7 @@
       options = [ "subvol=persist" "compress=zstd" "noatime" ];
     };
     "/kitty" = {
-      device = "10.2.0.2:/storage/BunStore";
+      device = "10.2.0.2:/storage/bun";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
     };
diff --git a/hosts/midas/firewall/default.nix b/hosts/midas/firewall/default.nix
index 674ac738..bc1fbcee 100644
--- a/hosts/midas/firewall/default.nix
+++ b/hosts/midas/firewall/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ ... }:
 {
   networking.nftables.tables.forwarding = {
     family = "inet";
diff --git a/hosts/midas/hardware/default.nix b/hosts/midas/hardware/default.nix
index 87d570c6..8ebaa185 100644
--- a/hosts/midas/hardware/default.nix
+++ b/hosts/midas/hardware/default.nix
@@ -1,7 +1,5 @@
-{ config, lib, modulesPath, ... }:
+{ config, lib, ... }:
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
 
diff --git a/modules/system/devices/disks/filesystems/default.nix b/modules/system/devices/disks/filesystems/default.nix
index 57176609..47bb33e6 100644
--- a/modules/system/devices/disks/filesystems/default.nix
+++ b/modules/system/devices/disks/filesystems/default.nix
@@ -1,8 +1,14 @@
 { config, ... }:
 {
-  boot.supportedFilesystems = {
-    ntfs = config.system.desktop.enable;
-    zfs = config.system.server.enable;
+  boot = {
+    supportedFilesystems = {
+      ntfs = config.system.desktop.enable;
+      zfs = config.system.server.enable;
+    };
+    swraid = {
+      enable = config.system.server.enable;
+      mdadmConf = "MAILADDR contact@nixfox.ca";
+    };
   };
 
   services = {