diff --git a/flake.nix b/flake.nix index a434dbc..2ad8f11 100644 --- a/flake.nix +++ b/flake.nix @@ -158,7 +158,6 @@ hydra = ./modules/nixos/hydra.nix; monitoring = ./modules/nixos/monitoring; nur-update = ./modules/nixos/nur-update.nix; - raid = ./modules/nixos/raid.nix; remote-builder-build04 = ./modules/nixos/remote-builder/build04.nix; remote-builder-darwin02 = ./modules/nixos/remote-builder/darwin02.nix; remote-builder-darwin03 = ./modules/nixos/remote-builder/darwin03.nix; diff --git a/hosts/build01/configuration.nix b/hosts/build01/configuration.nix index 9a8cc56..4f662dd 100644 --- a/hosts/build01/configuration.nix +++ b/hosts/build01/configuration.nix @@ -13,7 +13,6 @@ imports = [ inputs.srvos.nixosModules.hardware-hetzner-online-amd inputs.self.nixosModules.common - inputs.self.nixosModules.raid inputs.self.nixosModules.zfs inputs.self.nixosModules.community-builder ]; @@ -24,6 +23,8 @@ # /boot is a mirror raid boot.loader.grub.devices = [ "/dev/sda" "/dev/sdb" ]; boot.loader.grub.enable = true; + boot.swraid.enable = true; + boot.loader.grub.extraConfig = "insmod mdraid1x"; networking.hostName = "build01"; networking.hostId = "d2905767"; diff --git a/hosts/build02/configuration.nix b/hosts/build02/configuration.nix index 2521579..d2e6c68 100644 --- a/hosts/build02/configuration.nix +++ b/hosts/build02/configuration.nix @@ -8,13 +8,14 @@ ./nixpkgs-update-backup.nix inputs.self.nixosModules.common inputs.self.nixosModules.hercules-ci - inputs.self.nixosModules.raid inputs.self.nixosModules.zfs ]; # /boot is a mirror raid boot.loader.grub.devices = [ "/dev/nvme0n1" "/dev/nvme1n1" ]; boot.loader.grub.enable = true; + boot.swraid.enable = true; + boot.loader.grub.extraConfig = "insmod mdraid1x"; networking.hostName = "build02"; networking.hostId = "af9ccc71"; diff --git a/hosts/build03/configuration.nix b/hosts/build03/configuration.nix index e61e74c..87e5acd 100644 --- a/hosts/build03/configuration.nix +++ b/hosts/build03/configuration.nix @@ -14,7 +14,6 @@ inputs.srvos.nixosModules.hardware-hetzner-online-amd inputs.self.nixosModules.common inputs.self.nixosModules.hercules-ci - inputs.self.nixosModules.raid inputs.self.nixosModules.watch-store inputs.self.nixosModules.zfs inputs.self.nixosModules.remote-builder-build04 @@ -29,6 +28,8 @@ # /boot is a mirror raid boot.loader.grub.devices = [ "/dev/nvme0n1" "/dev/nvme1n1" ]; boot.loader.grub.enable = true; + boot.swraid.enable = true; + boot.loader.grub.extraConfig = "insmod mdraid1x"; systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f9:3a:3b16::1/64"; diff --git a/modules/nixos/raid.nix b/modules/nixos/raid.nix deleted file mode 100644 index 911ee0e..0000000 --- a/modules/nixos/raid.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - # for mdraid 1.1 - boot.loader.grub.extraConfig = "insmod mdraid1x"; -}