From e433d2ec3f46a5ee4a104f123b25fb4a28caba27 Mon Sep 17 00:00:00 2001 From: Kabbone Date: Wed, 16 Apr 2025 14:51:51 +0200 Subject: [PATCH] fix disko arguments, intial changes kubemaster --- disko/btrfs.nix | 4 ++-- hosts/kubemaster-1/hardware-configuration.nix | 5 +++-- modules/services/kubemaster/default.nix | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 modules/services/kubemaster/default.nix diff --git a/disko/btrfs.nix b/disko/btrfs.nix index 1199250..de0da1c 100644 --- a/disko/btrfs.nix +++ b/disko/btrfs.nix @@ -13,7 +13,7 @@ content = { type = "filesystem"; format = "vfat"; - extraArgs = [ "-n NIXBOOT" ]; + extraArgs = [ "-n" "NIXBOOT" ]; mountpoint = "/boot"; mountOptions = [ "defaults" @@ -24,7 +24,7 @@ size = "100%"; content = { type = "btrfs"; - extraArgs = [ "-f -L NIXROOT" ]; + extraArgs = [ "-f" "-L" "NIXROOT" ]; subvolumes = { "@" = { mountpoint = "/"; diff --git a/hosts/kubemaster-1/hardware-configuration.nix b/hosts/kubemaster-1/hardware-configuration.nix index 703b5e6..ef1661e 100644 --- a/hosts/kubemaster-1/hardware-configuration.nix +++ b/hosts/kubemaster-1/hardware-configuration.nix @@ -14,10 +14,10 @@ { imports = - [ (modulesPath + "/profiles/qemu-guest.nix") + [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -104,4 +104,5 @@ }; }; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/services/kubemaster/default.nix b/modules/services/kubemaster/default.nix new file mode 100644 index 0000000..7beb421 --- /dev/null +++ b/modules/services/kubemaster/default.nix @@ -0,0 +1,19 @@ +# +# Services +# +# flake.nix +# ├─ ./hosts +# │ └─ home.nix +# └─ ./modules +# └─ ./services +# └─ default.nix * +# └─ ... +# + +[ +# ./microvm.nix +# ./hydra.nix +] + +# picom, polybar and sxhkd are pulled from desktop module +# redshift temporarely disables