From 34f02c326d7458750b5ac30fae4b794cc0610ab4 Mon Sep 17 00:00:00 2001 From: Andre <10094408+8bitbuddhist@users.noreply.github.com> Date: Wed, 23 Apr 2025 09:49:58 -0400 Subject: [PATCH] Apply suggestions from code review - option name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add `hardware` to option name Co-authored-by: Jörg Thalheim --- microsoft/surface/README.md | 2 +- microsoft/surface/common/default.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/microsoft/surface/README.md b/microsoft/surface/README.md index cc5dbde5..7fc5675c 100644 --- a/microsoft/surface/README.md +++ b/microsoft/surface/README.md @@ -42,7 +42,7 @@ There are multiple versions of the Surface kernel available: This repo uses `longterm` by default, but you can switch it to `stable` by adding this to your configuration file: ```nix -microsoft-surface.kernelVersion = "stable"; +hardware.microsoft-surface.kernelVersion = "stable"; ``` ### Support Tools diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix index 09fa344a..361b802d 100644 --- a/microsoft/surface/common/default.nix +++ b/microsoft/surface/common/default.nix @@ -4,7 +4,7 @@ let inherit (lib) mkDefault mkOption types versions; # Set the version and hash for the kernel sources - srcVersion = with config.microsoft-surface; + srcVersion = with config.hardware.microsoft-surface; if kernelVersion == "longterm" then "6.12.22" else if kernelVersion == "stable" then @@ -12,7 +12,7 @@ let else abort "Invalid kernel version: ${kernelVersion}"; - srcHash = with config.microsoft-surface; + srcHash = with config.hardware.microsoft-surface; if kernelVersion == "longterm" then "sha256-q0iACrSZhaeNIxiuisXyj9PhI+oXNX7yFJgQWlMzczY=" else if kernelVersion == "stable" then @@ -21,7 +21,7 @@ let abort "Invalid kernel version: ${kernelVersion}"; # Set the version and hash for the linux-surface releases - pkgVersion = with config.microsoft-surface; + pkgVersion = with config.hardware.microsoft-surface; if kernelVersion == "longterm" then "6.12.7" else if kernelVersion == "stable" then @@ -29,7 +29,7 @@ let else abort "Invalid kernel version: ${kernelVersion}"; - pkgHash = with config.microsoft-surface; + pkgHash = with config.hardware.microsoft-surface; if kernelVersion == "longterm" then "sha256-Pv7O8D8ma+MPLhYP3HSGQki+Yczp8b7d63qMb6l4+mY=" else if kernelVersion == "stable" then @@ -60,7 +60,7 @@ let }; in { - options.microsoft-surface.kernelVersion = mkOption { + options.hardware.microsoft-surface.kernelVersion = mkOption { description = "Kernel Version to use (patched for MS Surface)"; type = types.enum [ "longterm"