refactor: removing needless module complexity

modules/nixos/programs/android/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.utils.android;
+  cfg = config.nixos.programs.android;
 in {
   options = {
-    nixos.utils.android.enable = mkEnableOption "Enables android tools";
+    nixos.programs.android.enable = mkEnableOption "Enables android tools";
   };
   config = mkIf cfg.enable {
     programs.adb.enable = true;

modules/nixos/programs/anyrun/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.utils.anyrun;
+  cfg = config.nixos.programs.anyrun;
 in {
   options = {
-    nixos.utils.anyrun.enable = mkEnableOption "Enables anyrun";
+    nixos.programs.anyrun.enable = mkEnableOption "Enables anyrun";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = [

modules/nixos/programs/beekeeper/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.studio.beekeeper;
+  cfg = config.nixos.programs.beekeeper;
 in {
   options = {
-    nixos.studio.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio";
+    nixos.programs.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [

modules/nixos/programs/blender/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkOption;
-  cfg = config.nixos.studio.blender;
+  cfg = config.nixos.programs.blender;
 in {
   options = {
-    nixos.studio.blender = {
+    nixos.programs.blender = {
       enable = mkEnableOption "Enables Blender";
       hip.enable = mkOption {
         type = lib.types.bool;

modules/nixos/programs/brightnessctl/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.utils.brightnessctl;
+  cfg = config.nixos.programs.brightnessctl;
 in {
   options = {
-    nixos.utils.brightnessctl.enable = mkEnableOption "Enables brigthnessctl";
+    nixos.programs.brightnessctl.enable = mkEnableOption "Enables brigthnessctl";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = [

modules/nixos/programs/corectrl/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.utils.corectrl;
+  cfg = config.nixos.programs.corectrl;
 in {
   options = {
-    nixos.utils.corectrl.enable = mkEnableOption "Enables CoreCtrl";
+    nixos.programs.corectrl.enable = mkEnableOption "Enables CoreCtrl";
   };
   config = mkIf cfg.enable {
     programs.corectrl = {

modules/nixos/programs/gamemode/default.nix

@@ -6,14 +6,14 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkOption;
-  cfg = config.nixos.gaming.gamemode;
+  cfg = config.nixos.programs.gamemode;
   pipewireLowLatencyModule = inputs.nix-gaming.nixosModules.pipewireLowLatency;
 in {
   imports = [
     pipewireLowLatencyModule
   ];
   options = {
-    nixos.gaming.gamemode = {
+    nixos.programs.gamemode = {
       enable = mkEnableOption "Enables gamemode";
       optimizeGpu.enable = mkOption {
         type = lib.types.bool;

modules/nixos/programs/gamescope/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.gaming.gamescope;
+  cfg = config.nixos.programs.gamescope;
 in {
   options = {
-    nixos.gaming.gamescope.enable = mkEnableOption "Enables gamescope";
+    nixos.programs.gamescope.enable = mkEnableOption "Enables gamescope";
   };
   config = mkIf cfg.enable {
     programs.gamescope = {

modules/nixos/programs/gimp/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.studio.gimp;
+  cfg = config.nixos.programs.gimp;
 in {
   options = {
-    nixos.studio.gimp.enable = mkEnableOption "Enables gimp";
+    nixos.programs.gimp.enable = mkEnableOption "Enables gimp";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = [

modules/nixos/programs/gnome/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.gui.gnome;
+  cfg = config.nixos.programs.gnome;
 in {
   options = {
-    nixos.gui.gnome.enable = mkEnableOption "Enables gnome";
+    nixos.programs.gnome.enable = mkEnableOption "Enables gnome";
   };
   config = mkIf cfg.enable {
     services = {

modules/nixos/programs/hyprland/default.nix

@@ -6,10 +6,11 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.gui.hyprland;
+  cfg = config.nixos.programs.hyprland;
+  hyprsysteminfoFlake = inputs.hyprsysteminfo.packages.${pkgs.system}.default;
 in {
   options = {
-    nixos.gui.hyprland.enable = mkEnableOption "Enables hyprland";
+    nixos.programs.hyprland.enable = mkEnableOption "Enables hyprland";
   };
   config = mkIf cfg.enable {
     security.pam.services.hyprlock.text = "auth include login";
@@ -19,6 +20,12 @@ in {
       package = inputs.hyprland.packages.${pkgs.system}.default;
       portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
     };
-    environment.variables.NIXOS_OZONE_WL = "1";
+    environment = {
+      variables.NIXOS_OZONE_WL = "1";
+      systemPackages = [
+        pkgs.hyprwayland-scanner
+        hyprsysteminfoFlake
+      ];
+    };
   };
 }

modules/nixos/programs/inkscape/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.studio.inkscape;
+  cfg = config.nixos.programs.inkscape;
 in {
   options = {
-    nixos.studio.inkscape.enable = mkEnableOption "Enables inkscape";
+    nixos.programs.inkscape.enable = mkEnableOption "Enables inkscape";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [

modules/nixos/programs/lutris/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.gaming.lutris;
+  cfg = config.nixos.programs.lutris;
 in {
   options = {
-    nixos.gaming.lutris.enable = mkEnableOption "Enables lutris";
+    nixos.programs.lutris.enable = mkEnableOption "Enables lutris";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [

modules/nixos/programs/microfetch/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.utils.microfetch;
+  cfg = config.nixos.programs.microfetch;
 in {
   options = {
-    nixos.utils.microfetch.enable = mkEnableOption "Enables microfetch";
+    nixos.programs.microfetch.enable = mkEnableOption "Enables microfetch";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = [inputs.microfetch.packages.x86_64-linux.default];

modules/nixos/programs/misc/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkOption mkMerge;
-  cfg = config.nixos.utils.misc;
+  cfg = config.nixos.programs.misc;
 in {
   options = {
-    nixos.utils.misc = {
+    nixos.programs.misc = {
       enable = mkEnableOption "Enables miscellaneous packages";
       desktop.enable = mkOption {
         type = lib.types.bool;

modules/nixos/programs/mysql-workbench/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.studio.mysql-workbench;
+  cfg = config.nixos.programs.mysql-workbench;
 in {
   options = {
-    nixos.studio.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench";
+    nixos.programs.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [

modules/nixos/programs/nh/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkOption;
-  cfg = config.nixos.utils.nh;
+  cfg = config.nixos.programs.nh;
 in {
   options = {
-    nixos.utils.nh = {
+    nixos.programs.nh = {
       enable = mkEnableOption "Enables nix helper";
       clean = {
         enable = mkEnableOption "Enables nix helper cleaning";

modules/nixos/programs/npm/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.utils.npm;
+  cfg = config.nixos.programs.npm;
 in {
   options = {
-    nixos.utils.npm.enable = mkEnableOption "Enables npm";
+    nixos.programs.npm.enable = mkEnableOption "Enables npm";
   };
   config = mkIf cfg.enable {
     programs.npm = {

modules/nixos/programs/obsidian/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.utils.obsidian;
+  cfg = config.nixos.programs.obsidian;
 in {
   options = {
-    nixos.utils.obsidian.enable = mkEnableOption "Enables obsidian";
+    nixos.programs.obsidian.enable = mkEnableOption "Enables obsidian";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = [

modules/nixos/programs/steam/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.gaming.steam;
+  cfg = config.nixos.programs.steam;
 in {
   options = {
-    nixos.gaming.steam.enable = mkEnableOption "Enables steam";
+    nixos.programs.steam.enable = mkEnableOption "Enables steam";
   };
   config = mkIf cfg.enable {
     programs = {

modules/nixos/programs/yubikey/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.utils.yubikey;
+  cfg = config.nixos.programs.yubikey;
 in {
   options = {
-    nixos.utils.yubikey.enable = mkEnableOption "Enables yubikey utilities";
+    nixos.programs.yubikey.enable = mkEnableOption "Enables yubikey utilities";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = [

modules/nixos/programs/zsh/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.utils.zsh;
+  cfg = config.nixos.programs.zsh;
 in {
   options = {
-    nixos.utils.zsh.enable = mkEnableOption "Enables zsh shell";
+    nixos.programs.zsh.enable = mkEnableOption "Enables zsh shell";
   };
   config = mkIf cfg.enable {
     programs.zsh.enable = cfg.enable;

modules/nixos/services/agenix/default.nix

@@ -7,10 +7,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkOption mkMerge;
-  cfg = config.nixos.services.security.agenix;
+  cfg = config.nixos.services.agenix;
 in {
   options = {
-    nixos.services.security.agenix = {
+    nixos.services.agenix = {
       enable = mkEnableOption "Enables agenix system environment";
       cnix.enable = mkOption {
         type = lib.types.bool;
@@ -36,11 +36,6 @@ in {
         secrets = {
           cnstssh.file = "${self}/secrets/cnstssh.age";
           cnixssh.file = "${self}/secrets/cnixssh.age";
-          helix-gpt = {
-            file = "${self}/secrets/helix-gpt.age";
-            owner = "cnst";
-            group = "users";
-          };
         };
       })
       (mkIf cfg.toothpc.enable {

modules/nixos/services/blueman/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.network.blueman;
+  cfg = config.nixos.services.blueman;
 in {
   options = {
-    nixos.services.network.blueman.enable = mkEnableOption "Enables blueman";
+    nixos.services.blueman.enable = mkEnableOption "Enables blueman";
   };
   config = mkIf cfg.enable {
     services = {

modules/nixos/services/dbus/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.session.dbus;
+  cfg = config.nixos.services.dbus;
 in {
   options = {
-    nixos.services.session.dbus.enable = mkEnableOption "Enables dbus";
+    nixos.services.dbus.enable = mkEnableOption "Enables dbus";
   };
   config = mkIf cfg.enable {
     services.dbus = {

modules/nixos/services/dconf/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.session.dconf;
+  cfg = config.nixos.services.dconf;
 in {
   options = {
-    nixos.services.session.dconf.enable = mkEnableOption "Enables dconf";
+    nixos.services.dconf.enable = mkEnableOption "Enables dconf";
   };
   config = mkIf cfg.enable {
     programs.dconf.enable = true;

modules/nixos/services/fwupd/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.system.fwupd;
+  cfg = config.nixos.services.fwupd;
 in {
   options = {
-    nixos.services.system.fwupd.enable = mkEnableOption "Enables fwupd";
+    nixos.services.fwupd.enable = mkEnableOption "Enables fwupd";
   };
   config = mkIf cfg.enable {
     services.fwupd.enable = true;

modules/nixos/services/gnome-keyring/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.security.gnome-keyring;
+  cfg = config.nixos.services.gnome-keyring;
 in {
   options = {
-    nixos.services.security.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring";
+    nixos.services.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring";
   };
   config = mkIf cfg.enable {
     services.gnome.gnome-keyring.enable = true;

modules/nixos/services/greetd/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkMerge mkOption types;
-  cfg = config.nixos.services.system.greetd;
+  cfg = config.nixos.services.greetd;
 in {
   options = {
-    nixos.services.system.greetd = {
+    nixos.services.greetd = {
       enable = mkEnableOption {
         type = types.bool;
         default = false;

modules/nixos/services/gvfs/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.system.gvfs;
+  cfg = config.nixos.services.gvfs;
 in {
   options = {
-    nixos.services.system.gvfs.enable = mkEnableOption "Enables gvfs";
+    nixos.services.gvfs.enable = mkEnableOption "Enables gvfs";
   };
   config = mkIf cfg.enable {
     services.gvfs.enable = true;

modules/nixos/services/kanata/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.system.kanata;
+  cfg = config.nixos.services.kanata;
 in {
   options = {
-    nixos.services.system.kanata.enable = mkEnableOption "Enables kanata keyboard remapping";
+    nixos.services.kanata.enable = mkEnableOption "Enables kanata keyboard remapping";
   };
   config = mkIf cfg.enable {
     services.kanata = {

modules/nixos/services/locate/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.system.locate;
+  cfg = config.nixos.services.locate;
 in {
   options = {
-    nixos.services.system.locate.enable = mkEnableOption "Enables plocate";
+    nixos.services.locate.enable = mkEnableOption "Enables plocate";
   };
   config = mkIf cfg.enable {
     services.locate = {

modules/nixos/services/mullvad/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.network.mullvad;
+  cfg = config.nixos.services.mullvad;
 in {
   options = {
-    nixos.services.network.mullvad.enable = mkEnableOption "Enables mullvad";
+    nixos.services.mullvad.enable = mkEnableOption "Enables mullvad";
   };
   config = mkIf cfg.enable {
     services.mullvad-vpn = {

modules/nixos/services/nix-ld/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.system.nix-ld;
+  cfg = config.nixos.services.nix-ld;
 in {
   options = {
-    nixos.services.system.nix-ld.enable = mkEnableOption "Enables nix-ld";
+    nixos.services.nix-ld.enable = mkEnableOption "Enables nix-ld";
   };
   config = mkIf cfg.enable {
     programs.nix-ld = {

modules/nixos/services/openssh/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.network.openssh;
+  cfg = config.nixos.services.openssh;
 in {
   options = {
-    nixos.services.network.openssh.enable = mkEnableOption "Enables openssh";
+    nixos.services.openssh.enable = mkEnableOption "Enables openssh";
   };
   config = mkIf cfg.enable {
     services.openssh = {

modules/nixos/services/pcscd/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.system.pcscd;
+  cfg = config.nixos.services.pcscd;
 in {
   options = {
-    nixos.services.system.pcscd.enable = mkEnableOption "Enables pcscd";
+    nixos.services.pcscd.enable = mkEnableOption "Enables pcscd";
   };
   config = mkIf cfg.enable {
     services.pcscd.enable = true;

modules/nixos/services/pipewire/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.system.pipewire;
+  cfg = config.nixos.services.pipewire;
 in {
   options = {
-    nixos.services.system.pipewire.enable = mkEnableOption "Enables pipewire";
+    nixos.services.pipewire.enable = mkEnableOption "Enables pipewire";
   };
   config = mkIf cfg.enable {
     security.rtkit.enable = true;

modules/nixos/services/powerd/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.system.powerd;
+  cfg = config.nixos.services.powerd;
 in {
   options = {
-    nixos.services.system.powerd.enable = mkEnableOption "Enables power-profiles-daemon";
+    nixos.services.powerd.enable = mkEnableOption "Enables power-profiles-daemon";
   };
   config = mkIf cfg.enable {
     services = {

modules/nixos/services/samba/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.network.samba;
+  cfg = config.nixos.services.samba;
 in {
   options = {
-    nixos.services.network.samba.enable = mkEnableOption "Enables samba";
+    nixos.services.samba.enable = mkEnableOption "Enables samba";
   };
   config = mkIf cfg.enable {
     services = {

modules/nixos/services/udisks/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.system.udisks;
+  cfg = config.nixos.services.udisks;
 in {
   options = {
-    nixos.services.system.udisks.enable = mkEnableOption "Enables udisks";
+    nixos.services.udisks.enable = mkEnableOption "Enables udisks";
   };
   config = mkIf cfg.enable {
     services.udisks2.enable = true;

modules/nixos/services/xserver/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkOption types;
-  cfg = config.nixos.services.session.xserver;
+  cfg = config.nixos.services.xserver;
 in {
   options = {
-    nixos.services.session.xserver = {
+    nixos.services.xserver = {
       videoDrivers = mkOption {
         type = types.listOf (types.enum ["amdgpu" "nvidia"]);
         default = ["amdgpu"];

modules/nixos/services/zram/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.nixos.services.system.zram;
+  cfg = config.nixos.services.zram;
 in {
   options = {
-    nixos.services.system.zram.enable = mkEnableOption "Enables zram";
+    nixos.services.zram.enable = mkEnableOption "Enables zram";
   };
   config = mkIf cfg.enable {
     zramSwap.enable = true;