whovian/nixos_config
1
0
Fork 0
Code Issues Pull requests Activity

Remove isWSL and its related option module!

Browse source
This commit is contained in:
Whovian NTSN 2024-06-12 03:10:07 -04:00
parent c440848d79
commit da7cd843b3
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.nix
View file

@ -90,15 +90,6 @@
inherit (import ./system/sshKeys.nix) mySSHKeys; inherit (import ./system/sshKeys.nix) mySSHKeys;
myOptions = { lib, ... }: {
options = {
isWSL = lib.mkOption {
default = false;
type = lib.types.bool;
};
};
};
in in
{ {
# Notes # Notes
@ -118,7 +109,6 @@
nixos-wsl = nixpkgs.lib.nixosSystem { nixos-wsl = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
myOptions
./system/nixos-wsl/configuration.nix ./system/nixos-wsl/configuration.nix
./system/dotnet_os_codename-workaround.nix ./system/dotnet_os_codename-workaround.nix
# Source of this fix file is # Source of this fix file is
@ -132,8 +122,6 @@
{ {
system.configurationRevision = self.shortRev or self.dirtyShortRev or "dirty"; system.configurationRevision = self.shortRev or self.dirtyShortRev or "dirty";
isWSL = true;
users.users.whovian = { users.users.whovian = {
# extraGroups = myWslGroups; # extraGroups = myWslGroups;
# See above "let" expression # See above "let" expression

8
system/users.nix
View file

@ -1,6 +1,6 @@
{ {
lib, lib,
config, options,
pkgs, pkgs,
... ...
}: }:
@ -15,12 +15,8 @@
extraGroups = [ extraGroups = [
"wheel" "wheel"
# Enable 'sudo' for the user. # Enable 'sudo' for the user.
] ++ lib.optionals (!config.isWSL) [ ] ++ lib.optionals (!options ? wsl) [
# These are the groups for baremetal machines, or possibly VMs. # These are the groups for baremetal machines, or possibly VMs.
"networkmanager"
# Enable use of NetworkManager
"usb"
# This should enable access to usb devices.
"docker" "docker"
# Enable 'docker' for the user. # Enable 'docker' for the user.
]; ];