From da7cd843b3f234d0fe820dfb6b20e7e7562f4b48 Mon Sep 17 00:00:00 2001
From: Whovian9369 <Whovian9369@gmail.com>
Date: Wed, 12 Jun 2024 03:10:07 -0400
Subject: [PATCH] Remove `isWSL` and its related option module!

---
 flake.nix        | 12 ------------
 system/users.nix |  8 ++------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index 68924a9..f88c426 100644
--- a/flake.nix
+++ b/flake.nix
@@ -90,15 +90,6 @@
 
     inherit (import ./system/sshKeys.nix) mySSHKeys;
 
-    myOptions = { lib, ... }: {
-      options = {
-        isWSL = lib.mkOption {
-          default = false;
-          type = lib.types.bool;
-        };
-      };
-    };
-
   in
   {
   # Notes
@@ -118,7 +109,6 @@
       nixos-wsl = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          myOptions
           ./system/nixos-wsl/configuration.nix
           ./system/dotnet_os_codename-workaround.nix
             # Source of this fix file is
@@ -132,8 +122,6 @@
           {
             system.configurationRevision = self.shortRev or self.dirtyShortRev or "dirty";
 
-            isWSL = true;
-
             users.users.whovian = {
               # extraGroups = myWslGroups;
                 # See above "let" expression
diff --git a/system/users.nix b/system/users.nix
index a8226fa..d34c42b 100644
--- a/system/users.nix
+++ b/system/users.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  config,
+  options,
   pkgs,
   ...
 }:
@@ -15,12 +15,8 @@
         extraGroups = [
           "wheel"
             # Enable 'sudo' for the user.
-        ] ++ lib.optionals (!config.isWSL) [
+        ] ++ lib.optionals (!options ? wsl) [
         # These are the groups for baremetal machines, or possibly VMs.
-          "networkmanager"
-            # Enable use of NetworkManager
-          "usb"
-            # This should enable access to usb devices.
           "docker"
             # Enable 'docker' for the user.
         ];