hosts/bakke/configuration.nix

@@ -16,7 +16,6 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = "bakke";
-  networking.hostId = "99609ffc";
   systemd.network.networks."30-enp2s0" = values.defaultNetworkConfig // {
     matchConfig.Name = "enp2s0";
     address = with values.hosts.bakke; [ (ipv4 + "/25") (ipv6 + "/64") ];

hosts/bakke/disks.nix

@@ -1,6 +1,5 @@
 {
   # https://github.com/nix-community/disko/blob/master/example/boot-raid1.nix
-  # Note: Disko was used to create the initial md raid, but is no longer in active use on this host.
   disko.devices = {
     disk = {
       one = {
@@ -9,6 +8,10 @@
         content = {
           type = "gpt";
           partitions = {
+            BOOT = {
+              size = "1M";
+              type = "EF02"; # for grub MBR
+            };
             ESP = {
               size = "500M";
               type = "EF00";
@@ -33,6 +36,10 @@
         content = {
           type = "gpt";
           partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02"; # for grub MBR
+            };
             ESP = {
               size = "500M";
               type = "EF00";

hosts/bakke/filesystems.nix

@@ -1,7 +1,9 @@
 { config, pkgs, lib, ... }:
 {
   # Boot drives:
-  boot.swraid.enable = true;
+  imports = [
+    ./boot-disks.nix
+  ];
 
   # ZFS Data pool:
   environment.systemPackages = with pkgs; [ zfs ];

hosts/bakke/hardware-configuration.nix

@@ -8,23 +8,12 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  swapDevices = [ ]; #TODO
-    { device = "/dev/disk/by-uuid/873e1891-d9f8-470f-9c57-e1b4c8b7bf0e";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-id/ata-WDC_WD40EFRX-68WT0N0_WD-WCC4E7LPLU71-part1";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  swapDevices = [ ];
 
   networking.useDHCP = lib.mkDefault false;