even more changes

modules/default.nix

@@ -0,0 +1,12 @@
+_: {
+  imports = [
+    ./programs
+    ./other
+    ./services
+    ./wms
+    ./runners
+    ./style
+    ./options
+    ./system
+  ];
+}

modules/options/system/hardware.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkOption mkEnableOption;
+  inherit (lib.types) str package int;
+in {
+  options.modules.system.hardware = {
+    nvidia = {
+      enable = mkEnableOption "Nvidia Nvidia graphics drivers";
+    };
+  };
+}

modules/options/system/module.nix

@@ -38,6 +38,8 @@ in {
 
     # monitor configuration
     ./monitors.nix
+
+    ./hardware.nix
   ];
   config = {
     warnings = mkMerge [
@@ -92,12 +94,13 @@ in {
 
     video = {
       enable = mkEnableOption "video drivers and programs that require a graphical user interface";
-      nvidia = mkOption "Nvidia graphics drivers";
-      amd = mkOption "AMD graphics drivers";
+      nvidia = mkEnableOption "Nvidia graphics drivers";
+      amd = mkEnableOption "AMD graphics drivers";
     };
 
-    bluetooth = {
+    hardware.bluetooth = {
       enable = mkEnableOption "bluetooth modules, drivers and configuration program(s)";
+      powerOnBoot = mkEnableOption "Enable bluetooth on boot";
     };
 
     # should the device enable printing module and try to load common printer modules

modules/programs/default.nix

@@ -3,14 +3,6 @@ _: {
     ./cli
     ./gui
     ./tui
-    ./other
-    ./services
     ./editors
-    ./wms
-    ./runners
-    ./style
-    ./options
-    ./system/nix/module.nix
-    ./system
   ];
 }

modules/style/default.nix

@@ -1,6 +1,5 @@
 _: {
   imports = [
-    ./stylix.nix
     ./quickshell
     ./qt.nix
     ./gtk.nix

modules/style/fonts.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.types) optional;
   inherit (config.modules.system.fonts) extraFonts;
+  inherit (config.modules.other.system) username;
 in {
   # A (somewhat) sane list of default fonts to be installed.
   fonts.packages = with pkgs;
@@ -21,12 +22,14 @@ in {
     ]
     ++ optional (extraFonts != null) extraFonts;
   # this fixes emoji stuff
-  fontconfig = {
-    defaultFonts = {
-      monospace = ["ComicShannsMono Nerd Font" "Noto Color Emoji"];
-      sansSerif = ["ComicShannsMono Nerd Font" "Noto Color Emoji"];
-      serif = ["ComicShannsMono Nerd Font" "Noto Color Emoji"];
-      emoji = ["Noto Color Emoji"];
+  home-manager.users.${username} = {
+    fontconfig = {
+      defaultFonts = {
+        monospace = ["ComicShannsMono Nerd Font" "Noto Color Emoji"];
+        sansSerif = ["ComicShannsMono Nerd Font" "Noto Color Emoji"];
+        serif = ["ComicShannsMono Nerd Font" "Noto Color Emoji"];
+        emoji = ["Noto Color Emoji"];
+      };
     };
   };
 }

modules/system/boot/default.nix

@@ -0,0 +1 @@
+_: {imports = [./grub-boot.nix];}

modules/system/default.nix

@@ -1,5 +1,9 @@
 _: {
   imports = [
     ./keyboard.nix
+    ./boot
+    ./hardware
+    ./nix/module.nix
+    ./os/networking/module.nix
   ];
 }

modules/system/hardware/bluetooth.nix

@@ -2,12 +2,13 @@
   config,
   lib,
   pkgs,
+  ...
 }: let
   cfg = config.modules.system.hardware.bluetooth;
   inherit (config.modules.other.system) username;
   inherit (lib) mkIf;
 in {
-  confg = mkIf cfg.enable {
+  config = mkIf cfg.enable {
     hardware.bluetooth = {
       enable = true;
       powerOnBoot = mkIf cfg.powerOnBoot true;

modules/system/hardware/default.nix

@@ -0,0 +1 @@
+_: {imports = [./bluetooth.nix ./graphics.nix];}

modules/system/hardware/sound/default.nix

@@ -0,0 +1 @@
+_: {imports = [./pipewire];}