Simplify Ficolo builder configuration and fix nix issues and formatting

Signed-off-by: Marko Kaapu <[email protected]>
tiiuae · Nov 28, 2023 · 3e16351 · 3e16351
1 parent 7118fda
commit 3e16351
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 86 deletions.
diff --git a/hosts/ficolobuild/configuration.nix b/hosts/ficolobuild/configuration.nix
diff --git a/hosts/ficolobuild/default.nix b/hosts/ficolobuild/default.nix
@@ -3,25 +3,46 @@
 # SPDX-License-Identifier: Apache-2.0
 {
   self,
+  config,
   inputs,
   lib,
+  modulesPath,
   ...
 }: {
-  flake.nixosConfigurations = {
-    generic-x86_64-linux = lib.nixosSystem {
-      specialArgs = {
-        inherit self inputs;
-      };
-      modules = [
-        inputs.disko.nixosModules.disko
-        (with self.nixosModules; [
-          user-cazfi
-          user-hrosten
-          user-jrautiola
-          user-mkaapu
-        ])
-        ./configuration.nix
-      ];
-    };
-  };
+  imports = lib.flatten [
+    (modulesPath + "/installer/scan/not-detected.nix")
+    inputs.disko.nixosModules.disko
+    (with self.nixosModules; [
+      common
+      user-cazfi
+      user-hrosten
+      user-jrautiola
+      user-mkaapu
+    ])
+    ./disk-config.nix
+  ];
+
+  boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "megaraid_sas" "nvme" "usbhid" "sd_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # networking.hostName = "nixos"; # Define your hostname.
+  networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
+
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
 }
diff --git a/hosts/ficolobuild/disk-config.nix b/hosts/ficolobuild/disk-config.nix
@@ -17,9 +17,12 @@
             };
             ESP = {
               size = "512M";
-              type = "EFOO";
-              format = "vfat";
-              mountpoint = "/boot";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
             };
             root = {
               size = "100%";

diff --git a/hosts/ficolobuild/hardware-configuration.nix b/hosts/ficolobuild/hardware-configuration.nix