Task: moved hardware options into the niksos.hardware suboptions.

home/programs/games.nix

@@ -5,8 +5,9 @@
   lib,
   ...
 }: let
-  inherit (osConfig.niksos) desktop bluetooth;
+  inherit (osConfig.niksos) desktop hardware;
   inherit (desktop) games;
+  inherit (hardware) bluetooth;
 in {
   # Also look at system/programs/games.nix (some programs have to be overlayed or have systemwide modules that have to be installed.)
   home.packages = lib.mkIf games ([

home/shell/other.nix

@@ -4,25 +4,27 @@
   osConfig,
   inputs,
   ...
-}: {
+}: let
+  inherit (lib) optionals;
+  inherit (osConfig.niksos.hardware) bluetooth portable;
+in {
   home.packages =
     [
       pkgs.ripgrep
       pkgs.p7zip
+      pkgs.dua
+      pkgs.ffmpeg
+
       pkgs.usbutils
       pkgs.pciutils
       pkgs.inetutils
       pkgs.aria2
-      pkgs.dua
       pkgs.file
-      pkgs.ffmpeg
-      pkgs.gurk-rs
-      pkgs.playerctl
     ]
-    ++ lib.optionals osConfig.niksos.bluetooth [
+    ++ optionals bluetooth [
       pkgs.ear2ctl
     ]
-    ++ lib.optionals osConfig.niksos.portable.enable [
+    ++ optionals portable.enable [
       inputs.somcli.defaultPackage.${pkgs.system}
     ];
 }

home/wayland/hyprland/binds.nix

@@ -8,7 +8,8 @@
 }: let
   inherit (lib) getExe;
   inherit (config.lib.stylix.colors) base0D;
-  inherit (osConfig.niksos) desktop portable bluetooth;
+  inherit (osConfig.niksos) desktop hardware;
+  inherit (hardware) portable bluetooth;
   inherit (desktop) games;
 
   runOnce = program: "pgrep ${program} || uwsm app -- ${program}";

home/wayland/hyprland/default.nix

@@ -26,7 +26,7 @@ in {
           "${uwsm} finalize"
           "${hyprlock}" # Lock screen
         ]
-        ++ lib.optional osConfig.niksos.portable.enable "powermode sync";
+        ++ lib.optional osConfig.niksos.hardware.portable.enable "powermode sync";
     };
   };
 }

home/wayland/hyprlock.nix

@@ -15,7 +15,7 @@ in {
         hide_cursor = false;
         no_fade_in = true;
       };
-      auth."fingerprint:enabled" = true;
+      auth."fingerprint:enabled" = osConfig.niksos.hardware.fingerprint;
 
       label = [
         {