diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index 849c6f4..b349bb1 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -34,6 +34,12 @@ boot = { kernelParams = [ "mem_sleep_default=deep" "acpi_osi=\"!Windows 2020\"" ]; kernelModules = ["acpi_call"]; + kernelPackages = pkgs.linuxPackages_latest; + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + systemd-boot.configurationLimit = 10; + }; extraModulePackages = with config.boot.kernelPackages; [ acpi_call diff --git a/hosts/yoshino/default.nix b/hosts/yoshino/default.nix index f978da2..5c184a4 100644 --- a/hosts/yoshino/default.nix +++ b/hosts/yoshino/default.nix @@ -26,11 +26,17 @@ boot = { kernelParams = [ ]; kernelModules = ["acpi_call"]; + kernelPackages = pkgs.linuxPackages_latest; + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + systemd-boot.configurationLimit = 10; + }; extraModulePackages = with config.boot.kernelPackages; [ acpi_call cpupower ] ++ [pkgs.cpupower-gui]; - }; + }; } diff --git a/modules/core/default.nix b/modules/core/default.nix index 077666a..6f160d3 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -1,12 +1,10 @@ { ... }: { imports = - [(import ./bootloader.nix)] - ++ [(import ./docker.nix)] + [(import ./docker.nix)] ++ [(import ./hardware.nix)] ++ [(import ./displaylink.nix)] # ++ [(import ./printing.nix)] - # ++ [(import ./openrgb.nix)] ++ [(import ./xserver.nix)] ++ [(import ./network.nix)] ++ [(import ./pipewire.nix)] diff --git a/modules/core/default.violet.nix b/modules/core/default.violet.nix index 623db47..118f8a3 100644 --- a/modules/core/default.violet.nix +++ b/modules/core/default.violet.nix @@ -1,7 +1,6 @@ { ... }: { imports = - # [(import ./bootloader.nix)] [(import ./hardware.nix)] ++ [(import ./network.nix)] ++ [(import ./program.nix)]