eeva
/
nixos-hardware
mirror of https://github.com/NixOS/nixos-hardware
1
0
Fork 0
Code Issues Releases Wiki Activity

Tidy-up

This commit is contained in:
mexisme 2022-12-05 17:39:24 +13:00
parent e84ab22523
commit be728899cf
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
microsoft/surface/default.nix
View File

@ -9,7 +9,7 @@ in {
./firmware/surface-go/ath10k
];
microsoft-surface.kernel-version = mkDefault "5.19.17";
microsoft-surface.kernelVersion = mkDefault "5.19.17";
boot.extraModprobeConfig = mkDefault ''
options i915 enable_fbc=1 enable_rc6=1 modeset=1

5
microsoft/surface/kernel/default.nix
View File

@ -8,9 +8,8 @@ in {
./linux-5.19.17
];
options.microsoft-surface.kernel-version = mkOption {
options.microsoft-surface.kernelVersion = mkOption {
description = "Kernel Version to use (patched for MS Surface)";
type = types.enum [ ];
# default = "5.19.17";
type = types.enum [ ];
};
}

6
microsoft/surface/kernel/linux-5.19.17/default.nix
View File

@ -6,7 +6,7 @@ let
inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage repos;
cfg = config.microsoft-surface.kernel-version;
cfg = config.microsoft-surface;
version = "5.19.17";
extraMeta.branch = "5.19";
@ -25,11 +25,11 @@ let
};
in {
options.microsoft-surface.kernel-version = mkOption {
options.microsoft-surface.kernelVersion = mkOption {
type = types.enum [ "5.19.17" ];
};
config = mkIf (cfg == "5.19.17") {
config = mkIf (cfg.kernelVersion == "5.19.17") {
boot = {
inherit kernelPackages;
};