refactor arguments to options

also change theme to colorscheme

modules/hardware/audio.nix

@@ -1,6 +1,6 @@
-{ pkgs, lib, gui, ... }: {
+{ config, pkgs, lib, ... }: {
 
-  config = lib.mkIf gui.enable {
+  config = lib.mkIf config.gui.enable {
     sound.enable = true;
     hardware.pulseaudio.enable = true;
 

modules/hardware/default.nix

@@ -1,4 +1,4 @@
-{ lib, gui, ... }: {
+{ ... }: {
 
   imports = [
     ./audio.nix
@@ -7,6 +7,7 @@
     ./monitors.nix
     ./mouse.nix
     ./networking.nix
+    ./wifi.nix
   ];
 
 }

modules/hardware/monitors.nix

@@ -1,9 +1,9 @@
-{ pkgs, lib, gui, identity, ... }: {
+{ config, pkgs, lib, ... }: {
 
   # Timezone required for Redshift schedule
   imports = [ ../system/timezone.nix ];
 
-  config = lib.mkIf gui.enable {
+  config = lib.mkIf config.gui.enable {
 
     environment.systemPackages = with pkgs;
       [
@@ -23,7 +23,7 @@
     hardware.i2c.enable = true;
 
     # Grant user access to external monitors
-    users.users.${identity.user}.extraGroups = [ "i2c" ];
+    users.users.${config.user}.extraGroups = [ "i2c" ];
 
     services.xserver.displayManager = {
 

modules/hardware/mouse.nix

@@ -1,6 +1,6 @@
-{ pkgs, lib, gui, ... }: {
+{ config, pkgs, lib, ... }: {
 
-  config = lib.mkIf gui.enable {
+  config = lib.mkIf config.gui.enable {
 
     # Mouse config
     services.ratbagd.enable = true;

modules/hardware/networking.nix

@@ -1,9 +1,5 @@
 { ... }: {
 
-  networking.wireless.enable =
-    true; # Enables wireless support via wpa_supplicant.
-  networking.wireless.userControlled.enable = true;
-
   # The global useDHCP flag is deprecated, therefore explicitly set to false here.
   # Per-interface useDHCP will be mandatory in the future, so this generated config
   # replicates the default behaviour.

modules/hardware/wifi.nix

@@ -0,0 +1,7 @@
+{ ... }: {
+
+  networking.wireless.enable =
+    true; # Enables wireless support via wpa_supplicant.
+  networking.wireless.userControlled.enable = true;
+
+}