mirror of
https://codeberg.org/mart-w/nixos-x13s.git
synced 2024-11-24 16:04:51 +01:00
fix mainline kernel
This commit is contained in:
parent
5a4384c71b
commit
484e22bf03
|
@ -10,7 +10,7 @@ A binary cache is provided through Cachix so you can avoid re-building the kerne
|
||||||
|
|
||||||
https://app.cachix.org/cache/nixos-x13s
|
https://app.cachix.org/cache/nixos-x13s
|
||||||
|
|
||||||
Ensure you are not overriding the nixpkgs input when consuming this flake, or you may not be able to take advantags of this cache.
|
Ensure you are not overriding the nixpkgs input when consuming this flake, or you may not be able to take advantages of this cache.
|
||||||
|
|
||||||
## Add with a flake
|
## Add with a flake
|
||||||
|
|
||||||
|
@ -30,6 +30,13 @@ Ensure you are not overriding the nixpkgs input when consuming this flake, or yo
|
||||||
inputs.nixos-x13s.nixosModules.default
|
inputs.nixos-x13s.nixosModules.default
|
||||||
{
|
{
|
||||||
nixos-x13s.enable = true;
|
nixos-x13s.enable = true;
|
||||||
|
nixos-x13s.kernel = "jhovold"; # jhovold is default, but steev and mainline supported
|
||||||
|
|
||||||
|
# install multiple kernels! note this increases eval time for each specialization
|
||||||
|
specialisation = {
|
||||||
|
mainline.configuration.nixos-x13s.kernel = "mainline";
|
||||||
|
steev.configuration.nixos-x13s.kernel = "steev";
|
||||||
|
};
|
||||||
|
|
||||||
# allow unfree firmware
|
# allow unfree firmware
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
18
module.nix
18
module.nix
|
@ -10,14 +10,18 @@ let
|
||||||
x13sPackages = import ./packages/default.nix { inherit lib pkgs; };
|
x13sPackages = import ./packages/default.nix { inherit lib pkgs; };
|
||||||
|
|
||||||
dtbName = "sc8280xp-lenovo-thinkpad-x13s.dtb";
|
dtbName = "sc8280xp-lenovo-thinkpad-x13s.dtb";
|
||||||
linuxPackages_x13s = pkgs.linuxPackagesFor (
|
linuxPackages_x13s =
|
||||||
if cfg.kernel == "jhovold" then
|
if cfg.kernel == "mainline" then
|
||||||
x13sPackages.linux_jhovold
|
|
||||||
else if cfg.kernel == "steev" then
|
|
||||||
x13sPackages.linux_steev
|
|
||||||
else
|
|
||||||
pkgs.linuxPackages_latest
|
pkgs.linuxPackages_latest
|
||||||
);
|
else
|
||||||
|
pkgs.linuxPackagesFor (
|
||||||
|
if cfg.kernel == "jhovold" then
|
||||||
|
x13sPackages.linux_jhovold
|
||||||
|
else if cfg.kernel == "steev" then
|
||||||
|
x13sPackages.linux_steev
|
||||||
|
else
|
||||||
|
throw "Unsupported kernel"
|
||||||
|
);
|
||||||
dtb = "${linuxPackages_x13s.kernel}/dtbs/qcom/${dtbName}";
|
dtb = "${linuxPackages_x13s.kernel}/dtbs/qcom/${dtbName}";
|
||||||
|
|
||||||
alsa-ucm-conf-env.ALSA_CONFIG_UCM2 = "${x13sPackages."x13s/alsa-ucm-conf"}/share/alsa/ucm2";
|
alsa-ucm-conf-env.ALSA_CONFIG_UCM2 = "${x13sPackages."x13s/alsa-ucm-conf"}/share/alsa/ucm2";
|
||||||
|
|
Loading…
Reference in a new issue