From abb296f4eb44824e9765f50ee3fc4acc1f9e6e65 Mon Sep 17 00:00:00 2001 From: chn Date: Sat, 20 Apr 2024 10:57:00 +0800 Subject: [PATCH] typo --- devices/pcarm/default.nix | 2 +- devices/pi3b/default.nix | 2 +- modules/system/kernel/default.nix | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/devices/pcarm/default.nix b/devices/pcarm/default.nix index 51aac255..4074df40 100644 --- a/devices/pcarm/default.nix +++ b/devices/pcarm/default.nix @@ -20,7 +20,7 @@ inputs: networking = { hostname = "pcarm"; networkd = {}; }; binfmt.enable = false; nixpkgs.arch = "aarch64"; - kernel.varient = "nixos"; + kernel.variant = "nixos"; }; packages.packageSet = "server"; services.sshd = {}; diff --git a/devices/pi3b/default.nix b/devices/pi3b/default.nix index b3212934..d6cc0b72 100644 --- a/devices/pi3b/default.nix +++ b/devices/pi3b/default.nix @@ -21,7 +21,7 @@ inputs: networking = { hostname = "pi3b"; networkd = {}; }; binfmt.enable = false; nixpkgs.arch = "aarch64"; - kernel.varient = "nixos"; + kernel.variant = "nixos"; }; packages.packageSet = "server"; services = diff --git a/modules/system/kernel/default.nix b/modules/system/kernel/default.nix index 93fb12ba..1db9874c 100644 --- a/modules/system/kernel/default.nix +++ b/modules/system/kernel/default.nix @@ -2,7 +2,7 @@ inputs: { options.nixos.system.kernel = let inherit (inputs.lib) mkOption types; in { - varient = mkOption + variant = mkOption { type = types.enum [ "nixos" "xanmod-lts" "xanmod-latest" "cachyos" "cachyos-lto" "cachyos-server" ]; default = if inputs.config.nixos.system.gui.preferred then "cachyos" else "cachyos-server"; @@ -32,9 +32,9 @@ inputs: # networking for nas "igb" ] - ++ (inputs.lib.optionals (kernel.varient != "nixos") [ "crypto_simd" ]) + ++ (inputs.lib.optionals (kernel.variant != "nixos") [ "crypto_simd" ]) # for pi3b to show message over hdmi while boot - ++ (inputs.lib.optionals (kernel.varient == "nixos") [ "vc4" "bcm2835_dma" "i2c_bcm2835" ]); + ++ (inputs.lib.optionals (kernel.variant == "nixos") [ "vc4" "bcm2835_dma" "i2c_bcm2835" ]); extraModulePackages = (with inputs.config.boot.kernelPackages; [ v4l2loopback ]) ++ kernel.modules.install; extraModprobeConfig = builtins.concatStringsSep "\n" kernel.modules.modprobeConfig; kernelParams = [ "delayacct" "acpi_osi=Linux" "acpi.ec_no_wakeup=1" ]; @@ -47,7 +47,7 @@ inputs: cachyos-lto = inputs.pkgs.linuxPackages_cachyos-lto; cachyos-server = inputs.pkgs.linuxPackages_cachyos-server; rpi3 = inputs.pkgs.linuxPackages_rpi3; - }.${kernel.varient}; + }.${kernel.variant}; kernelPatches = let patches = @@ -129,7 +129,7 @@ inputs: }; } ( - inputs.lib.mkIf (inputs.lib.strings.hasPrefix "cachyos" kernel.varient) + inputs.lib.mkIf (inputs.lib.strings.hasPrefix "cachyos" kernel.variant) ( let scx = let rustPlatform = inputs.pkgs.unstablePackages.rustPlatform; @@ -145,7 +145,7 @@ inputs: ) ) ( - inputs.lib.mkIf (kernel.varient == "rpi3") + inputs.lib.mkIf (kernel.variant == "rpi3") { boot.initrd = { systemd.enableTpm2 = false; includeDefaultModules = false; }; } ) ];