From 68f6ced410dddefaf265a0e974bdd0f70398f50c Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Tue, 26 Aug 2025 19:47:36 -0500
Subject: [PATCH] cleanup

---
 modules/nixos/boot/{ => common}/default.nix |  2 +-
 modules/nixos/boot/plymouth/default.nix     |  4 ++--
 modules/nixos/fonts/default.nix             |  5 +++--
 modules/nixos/hardware/amd/options.nix      | 23 +++++++--------------
 modules/nixos/hardware/nvidia/options.nix   | 23 +++++++--------------
 5 files changed, 20 insertions(+), 37 deletions(-)
 rename modules/nixos/boot/{ => common}/default.nix (89%)

diff --git a/modules/nixos/boot/default.nix b/modules/nixos/boot/common/default.nix
similarity index 89%
rename from modules/nixos/boot/default.nix
rename to modules/nixos/boot/common/default.nix
index 37fb27c..9a71ae1 100644
--- a/modules/nixos/boot/default.nix
+++ b/modules/nixos/boot/common/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  isArm = ("aarch64-linux" == system);
+  isArm = ("aarch64-linux" == system) || ("aarch64-darwin" == system);
 in
 {
   boot = {
diff --git a/modules/nixos/boot/plymouth/default.nix b/modules/nixos/boot/plymouth/default.nix
index d7f1e9f..59e05f4 100644
--- a/modules/nixos/boot/plymouth/default.nix
+++ b/modules/nixos/boot/plymouth/default.nix
@@ -1,6 +1,6 @@
-{ ... }:
+{ lib, ... }:
 {
   boot.plymouth = {
-    enable = true;
+    enable = lib.mkDefault true;
   };
 }
diff --git a/modules/nixos/fonts/default.nix b/modules/nixos/fonts/default.nix
index 90ba4fa..6050ade 100644
--- a/modules/nixos/fonts/default.nix
+++ b/modules/nixos/fonts/default.nix
@@ -7,8 +7,9 @@
       noto-fonts
       noto-fonts-color-emoji
       meslo-lgs-nf
-    ]
-    ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
+      pkgs.nerd-fonts.jetbrains-mono
+    ];
+    # ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); # ALL fonts
 
   fonts.fontconfig.defaultFonts = {
     emoji = [
diff --git a/modules/nixos/hardware/amd/options.nix b/modules/nixos/hardware/amd/options.nix
index d95553e..ce4353d 100755
--- a/modules/nixos/hardware/amd/options.nix
+++ b/modules/nixos/hardware/amd/options.nix
@@ -1,27 +1,18 @@
 { lib, namespace, ... }:
 with lib;
+let
+  inherit (lib.${namespace}) mkOpt mkBoolOpt;
+in
 {
   options.${namespace}.hardware.amd = {
     enable = mkEnableOption "amd hardware config";
 
-    corectrl.enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    corectrl.enable = mkBoolOpt false "Enable Corectl";
 
-    corectrl.enablePolkit = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    corectrl.enablePolkit = mkBoolOpt false "Enable Corectl Polkit";
 
-    corectrl.polkitGroup = mkOption {
-      type = types.str;
-      default = "wheel";
-    };
+    corectrl.polkitGroup = mkOpt types.str "wheel" "Corectl Polkit Group";
 
-    lact.enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    lact.enable = mkBoolOpt false "Enable Lact daemon";
   };
 }
diff --git a/modules/nixos/hardware/nvidia/options.nix b/modules/nixos/hardware/nvidia/options.nix
index 2b2cb2b..38865f5 100755
--- a/modules/nixos/hardware/nvidia/options.nix
+++ b/modules/nixos/hardware/nvidia/options.nix
@@ -1,27 +1,18 @@
 { lib, namespace, ... }:
 with lib;
+let
+  inherit (lib.${namespace}) mkOpt mkBoolOpt;
+in
 {
   options.${namespace}.hardware.nvidia = {
     enable = mkEnableOption "nvidia hardware config";
 
-    enableOpen = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enableOpen = mkBoolOpt false "Enable open source driver";
 
-    nvidiaSettings = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    nvidiaSettings = mkBoolOpt false "Install nvidia settings";
 
-    enableBeta = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enableBeta = mkBoolOpt false "Enable Beta drivers";
 
-    enableNvidiaDocker = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enableNvidiaDocker = mkBoolOpt false "Enable nvidia docker support";
   };
 }