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

devices.pi3b: use default kernel

Browse Source
This commit is contained in:
陈浩南 2024-03-28 20:50:48 +08:00
parent db812b2ab7
commit 1d8366517a
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/pi3b/default.nix
View File

@ -21,7 +21,7 @@ inputs:
networking = { hostname = "pi3b"; networkd = {}; }; networking = { hostname = "pi3b"; networkd = {}; };
binfmt.enable = false; binfmt.enable = false;
nixpkgs.arch = "aarch64"; nixpkgs.arch = "aarch64";
kernel.varient = "rpi3"; kernel.varient = "nixos";
}; };
packages.packageSet = "server"; packages.packageSet = "server";
services = services =

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

@ -4,7 +4,7 @@ inputs:
{ {
varient = mkOption varient = mkOption
{ {
type = types.enum [ "xanmod-lts" "xanmod-latest" "cachyos" "cachyos-lto" "rpi3" ]; type = types.enum [ "nixos" "xanmod-lts" "xanmod-latest" "cachyos" "cachyos-lto" ];
default = "xanmod-lts"; default = "xanmod-lts";
}; };
patches = mkOption { type = types.listOf types.nonEmptyStr; default = []; }; patches = mkOption { type = types.listOf types.nonEmptyStr; default = []; };
@ -28,20 +28,17 @@ inputs:
"bfq" "failover" "net_failover" "nls_cp437" "nls_iso8859-1" "sd_mod" "bfq" "failover" "net_failover" "nls_cp437" "nls_iso8859-1" "sd_mod"
"sr_mod" "usbcore" "usbhid" "usbip-core" "usb-common" "usb_storage" "vhci-hcd" "virtio" "virtio_blk" "sr_mod" "usbcore" "usbhid" "usbip-core" "usb-common" "usb_storage" "vhci-hcd" "virtio" "virtio_blk"
"virtio_net" "virtio_ring" "virtio_scsi" "cryptd" "libaes" "virtio_net" "virtio_ring" "virtio_scsi" "cryptd" "libaes"
"ahci" "ata_piix" "nvme" "sdhci_acpi" "virtio_pci" "xhci_pci"
# networking for nas
"igb"
] ]
++ ( ++ (inputs.lib.optionals (kernel.varient != "nixos") [ "crypto_simd" ]);
inputs.lib.optionals (kernel.varient != "rpi3")
[
"ahci" "ata_piix" "nvme" "sdhci_acpi" "virtio_pci" "xhci_pci" "crypto_simd"
# networking for nas
"igb"
]
);
extraModulePackages = (with inputs.config.boot.kernelPackages; [ v4l2loopback ]) ++ kernel.modules.install; extraModulePackages = (with inputs.config.boot.kernelPackages; [ v4l2loopback ]) ++ kernel.modules.install;
extraModprobeConfig = builtins.concatStringsSep "\n" kernel.modules.modprobeConfig; extraModprobeConfig = builtins.concatStringsSep "\n" kernel.modules.modprobeConfig;
kernelParams = [ "delayacct" "acpi_osi=Linux" "acpi.ec_no_wakeup=1" ]; kernelParams = [ "delayacct" "acpi_osi=Linux" "acpi.ec_no_wakeup=1" ];
kernelPackages = kernelPackages =
{ {
nixos = inputs.pkgs.linuxPackages;
xanmod-lts = inputs.pkgs.linuxPackages_xanmod; xanmod-lts = inputs.pkgs.linuxPackages_xanmod;
xanmod-latest = inputs.pkgs.linuxPackages_xanmod_latest; xanmod-latest = inputs.pkgs.linuxPackages_xanmod_latest;
cachyos = inputs.pkgs.linuxPackages_cachyos; cachyos = inputs.pkgs.linuxPackages_cachyos;