From be728899cfc9c9c53910b5f1bb928c06fd6688ff Mon Sep 17 00:00:00 2001
From: mexisme <wildjim+dev@kiwinet.org>
Date: Mon, 5 Dec 2022 17:39:24 +1300
Subject: [PATCH] Tidy-up

---
 microsoft/surface/default.nix                      | 2 +-
 microsoft/surface/kernel/default.nix               | 5 ++---
 microsoft/surface/kernel/linux-5.19.17/default.nix | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/microsoft/surface/default.nix b/microsoft/surface/default.nix
index e193d2a..22f6c6c 100644
--- a/microsoft/surface/default.nix
+++ b/microsoft/surface/default.nix
@@ -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
diff --git a/microsoft/surface/kernel/default.nix b/microsoft/surface/kernel/default.nix
index 0c8dcfc..627ed3d 100644
--- a/microsoft/surface/kernel/default.nix
+++ b/microsoft/surface/kernel/default.nix
@@ -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 [ ];
   };
 }
diff --git a/microsoft/surface/kernel/linux-5.19.17/default.nix b/microsoft/surface/kernel/linux-5.19.17/default.nix
index d33a43e..6cc1830 100644
--- a/microsoft/surface/kernel/linux-5.19.17/default.nix
+++ b/microsoft/surface/kernel/linux-5.19.17/default.nix
@@ -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;
     };