diff --git a/hosts/ess-helm/default.nix b/hosts/ess-helm/default.nix index d9cc6ef..5fbf9d6 100644 --- a/hosts/ess-helm/default.nix +++ b/hosts/ess-helm/default.nix @@ -7,7 +7,6 @@ { imports = [ ./boot.nix - ./ess.nix ./hardware.nix ./networking.nix ./packages.nix diff --git a/hosts/ess-helm/hardware.nix b/hosts/ess-helm/hardware.nix index a95d46d..cc0f378 100644 --- a/hosts/ess-helm/hardware.nix +++ b/hosts/ess-helm/hardware.nix @@ -1,7 +1,5 @@ { - config, lib, - pkgs, modulesPath, ... }: @@ -11,17 +9,19 @@ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = [ - "ahci" - "xhci_pci" - "virtio_pci" - "virtio_scsi" - "sd_mod" - "sr_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot = { + initrd.availableKernelModules = [ + "ahci" + "xhci_pci" + "virtio_pci" + "virtio_scsi" + "sd_mod" + "sr_mod" + ]; + initrd.kernelModules = [ ]; + kernelModules = [ ]; + extraModulePackages = [ ]; + }; fileSystems."/" = { device = "/dev/disk/by-label/ROOT"; diff --git a/hosts/ess-helm/services/default.nix b/hosts/ess-helm/services/default.nix index c8695e0..cd29f64 100644 --- a/hosts/ess-helm/services/default.nix +++ b/hosts/ess-helm/services/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./ess.nix ./nginx.nix ./openssh.nix ]; diff --git a/hosts/ess-helm/services/ess.nix b/hosts/ess-helm/services/ess.nix index daa37ae..5cf55ad 100644 --- a/hosts/ess-helm/services/ess.nix +++ b/hosts/ess-helm/services/ess.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { services.k3s = {