refactor: removing needless module complexity

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;