diff --git a/devices/pi3b/default.nix b/devices/pi3b/default.nix index eb40c16a..bae06024 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 = "rpi3"; + kernel.varient = "nixos"; }; packages.packageSet = "server"; services = diff --git a/modules/system/kernel/default.nix b/modules/system/kernel/default.nix index b6c418a4..69b56460 100644 --- a/modules/system/kernel/default.nix +++ b/modules/system/kernel/default.nix @@ -4,7 +4,7 @@ inputs: { 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"; }; patches = mkOption { type = types.listOf types.nonEmptyStr; default = []; }; @@ -28,20 +28,17 @@ inputs: "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" "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 != "rpi3") - [ - "ahci" "ata_piix" "nvme" "sdhci_acpi" "virtio_pci" "xhci_pci" "crypto_simd" - # networking for nas - "igb" - ] - ); + ++ (inputs.lib.optionals (kernel.varient != "nixos") [ "crypto_simd" ]); 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" ]; kernelPackages = { + nixos = inputs.pkgs.linuxPackages; xanmod-lts = inputs.pkgs.linuxPackages_xanmod; xanmod-latest = inputs.pkgs.linuxPackages_xanmod_latest; cachyos = inputs.pkgs.linuxPackages_cachyos;