From 19c8ad7b34e5d3eb5cd100f86c878d62b333e78c Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Mon, 22 Apr 2024 22:34:20 +0800 Subject: [PATCH] nixos/core: set bootloader for per-host --- hosts/aristotle/default.nix | 1 + hosts/blacksteel/default.nix | 20 ++++++++++---------- nixos/profiles/common/core/default.nix | 5 +---- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/hosts/aristotle/default.nix b/hosts/aristotle/default.nix index 364cd28..d32d204 100644 --- a/hosts/aristotle/default.nix +++ b/hosts/aristotle/default.nix @@ -13,6 +13,7 @@ ../../nixos/profiles/common/opt-in/disko.nix ]; + boot.loader.efi.canTouchEfiVariables = true; networking.hostName = "aristotle"; time.timeZone = "Asia/Shanghai"; _module.args.disks = ["/dev/nvme0n1"]; # Disko diff --git a/hosts/blacksteel/default.nix b/hosts/blacksteel/default.nix index 98b092c..6afb680 100644 --- a/hosts/blacksteel/default.nix +++ b/hosts/blacksteel/default.nix @@ -13,6 +13,9 @@ ./anti-feature.nix ]; + + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.systemd-boot.enable = true; networking.hostName = "blacksteel"; time.timeZone = "Asia/Shanghai"; @@ -28,16 +31,13 @@ eula = true; openFirewall = true; - package = pkgs.papermc.override {jre = pkgs.temurin-bin;}; - - # TODO: error: list index 1 is out of bounds - # (pkgs.papermc.overrideAttrs (old: { - # version = "1.20.4.454"; - # src = old.src.overrideAttrs { - # outputHash = "sha256-vH098T6gt/QpM0QOGTzu5VPNWPDYnmF8LQiRK6mDPS8="; - # }; - # })) - # .override {jre = pkgs.temurin-bin;}; + # I should switch to vanilla/fabric one day... + package = pkgs.papermc.overrideAttrs { + version = "1.20.4-485"; + hash = "sha256-8bhlv/MU7KDmdL8Ngvg/zLMlGiO4Fswoyn/1diFE65k="; + }; + # TODO: not working for some reason + #.override {jre = pkgs.temurin-bin;}; # Aikar's flag # https://aikar.co/2018/07/02/tuning-the-jvm-g1gc-garbage-collector-flags-for-minecraft/ diff --git a/nixos/profiles/common/core/default.nix b/nixos/profiles/common/core/default.nix index 261c787..89f2eb8 100644 --- a/nixos/profiles/common/core/default.nix +++ b/nixos/profiles/common/core/default.nix @@ -37,10 +37,7 @@ extraSpecialArgs = {inherit inputs;}; # ??? isnt specialArgs imported by default ??? }; - ### Boot - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.systemd-boot.enable = lib.mkDefault true; # mkDefault for Lanzaboote - boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_zen; # mkDefault for server + boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_zen; ### Default Programs # In addition of https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/config/system-path.nix