chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2024-10-23 05:39:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

typo

Browse Source
This commit is contained in:
陈浩南 2024-04-20 10:57:00 +08:00
parent 80167bda73
commit abb296f4eb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/pcarm/default.nix
View File

@ -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 = {};

2
devices/pi3b/default.nix
View File

@ -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 =

12
modules/system/kernel/default.nix
View File

@ -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; }; }
)
];