Skip to content

Commit 34f02c3

Browse files
8bitbuddhistMic92
andcommitted
Apply suggestions from code review - option name
Add `hardware` to option name Co-authored-by: Jörg Thalheim <[email protected]>
1 parent 0012cff commit 34f02c3

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

microsoft/surface/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ There are multiple versions of the Surface kernel available:
4242
This repo uses `longterm` by default, but you can switch it to `stable` by adding this to your configuration file:
4343

4444
```nix
45-
microsoft-surface.kernelVersion = "stable";
45+
hardware.microsoft-surface.kernelVersion = "stable";
4646
```
4747

4848
### Support Tools

microsoft/surface/common/default.nix

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ let
44
inherit (lib) mkDefault mkOption types versions;
55

66
# Set the version and hash for the kernel sources
7-
srcVersion = with config.microsoft-surface;
7+
srcVersion = with config.hardware.microsoft-surface;
88
if kernelVersion == "longterm" then
99
"6.12.22"
1010
else if kernelVersion == "stable" then
1111
"6.14.2"
1212
else
1313
abort "Invalid kernel version: ${kernelVersion}";
1414

15-
srcHash = with config.microsoft-surface;
15+
srcHash = with config.hardware.microsoft-surface;
1616
if kernelVersion == "longterm" then
1717
"sha256-q0iACrSZhaeNIxiuisXyj9PhI+oXNX7yFJgQWlMzczY="
1818
else if kernelVersion == "stable" then
@@ -21,15 +21,15 @@ let
2121
abort "Invalid kernel version: ${kernelVersion}";
2222

2323
# Set the version and hash for the linux-surface releases
24-
pkgVersion = with config.microsoft-surface;
24+
pkgVersion = with config.hardware.microsoft-surface;
2525
if kernelVersion == "longterm" then
2626
"6.12.7"
2727
else if kernelVersion == "stable" then
2828
"6.14.2"
2929
else
3030
abort "Invalid kernel version: ${kernelVersion}";
3131

32-
pkgHash = with config.microsoft-surface;
32+
pkgHash = with config.hardware.microsoft-surface;
3333
if kernelVersion == "longterm" then
3434
"sha256-Pv7O8D8ma+MPLhYP3HSGQki+Yczp8b7d63qMb6l4+mY="
3535
else if kernelVersion == "stable" then
@@ -60,7 +60,7 @@ let
6060
};
6161

6262
in {
63-
options.microsoft-surface.kernelVersion = mkOption {
63+
options.hardware.microsoft-surface.kernelVersion = mkOption {
6464
description = "Kernel Version to use (patched for MS Surface)";
6565
type = types.enum [
6666
"longterm"

0 commit comments

Comments
 (0)