some more housecleaning and changing swap on cnixpad

system/modules/sysd/network/blueman/default.nix

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

system/modules/sysd/network/mullvad/default.nix

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

system/modules/sysd/network/samba/default.nix

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

system/modules/sysd/network/ssh/default.nix

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

system/modules/sysd/security/agenix/default.nix

@@ -0,0 +1,63 @@
+{
+  config,
+  lib,
+  inputs,
+  pkgs,
+  self,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption mkOption mkMerge;
+  cfg = config.modules.sysd.security.agenix;
+in {
+  options = {
+    modules.sysd.security.agenix = {
+      enable = mkEnableOption "Enables agenix system environment";
+      cnix.enable = mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Apply cnix agenix settings";
+      };
+      toothpc.enable = mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Apply toothpc agenix settings";
+      };
+      cnixpad.enable = mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Apply cnixpad agenix settings";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    age = mkMerge [
+      (mkIf cfg.cnix.enable {
+        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 {
+        secrets = {
+          # Add toothpc specific secrets here
+        };
+      })
+      (mkIf cfg.cnixpad.enable {
+        secrets = {
+          # Add adampad specific secrets here
+        };
+      })
+    ];
+
+    environment.systemPackages = [
+      inputs.agenix.packages.x86_64-linux.default
+      pkgs.age
+    ];
+  };
+}

system/modules/sysd/security/gnome-keyring/default.nix

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

system/modules/sysd/session/dbus/default.nix

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

system/modules/sysd/session/dconf/default.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.modules.sysd.session.dconf;
+in {
+  options = {
+    modules.sysd.session.dconf.enable = mkEnableOption "Enables dconf";
+  };
+  config = mkIf cfg.enable {
+    programs.dconf.enable = true;
+  };
+}

system/modules/sysd/session/xserver/amd/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.xserver.amd;
+  cfg = config.modules.sysd.session.xserver.amd;
 in {
   options = {
-    modules.sysd.xserver.amd.enable = mkEnableOption "Enables xserver with amdgpu";
+    modules.sysd.session.xserver.amd.enable = mkEnableOption "Enables xserver with amdgpu";
   };
   config = mkIf cfg.enable {
     services.xserver = {

system/modules/sysd/session/xserver/amd/hhkbse/default.nix

@@ -6,10 +6,10 @@
 }: let
   path = "${hostConfig}/cnix/xkb/symbols";
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.xserver.amd.hhkbse;
+  cfg = config.modules.sysd.session.xserver.amd.hhkbse;
 in {
   options = {
-    modules.sysd.xserver.amd.hhkbse.enable = mkEnableOption "Enables xserver for amdgpu with HHKBSE";
+    modules.sysd.session.xserver.amd.hhkbse.enable = mkEnableOption "Enables xserver for amdgpu with HHKBSE";
   };
   config = mkIf cfg.enable {
     services.xserver = {

system/modules/sysd/session/xserver/nvidia/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.xserver.nvidia;
+  cfg = config.modules.sysd.session.xserver.nvidia;
 in {
   options = {
-    modules.sysd.xserver.nvidia.enable = mkEnableOption "Enables xserver with nvidia";
+    modules.sysd.session.xserver.nvidia.enable = mkEnableOption "Enables xserver with nvidia";
   };
   config = mkIf cfg.enable {
     services.xserver = {

system/modules/sysd/system/fwupd/default.nix

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

system/modules/sysd/system/greetd/default.nix

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

system/modules/sysd/system/gvfs/default.nix

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

system/modules/sysd/system/locate/default.nix

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

system/modules/sysd/system/nix-ld/default.nix

@@ -0,0 +1,103 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.modules.sysd.system.nix-ld;
+in {
+  options = {
+    modules.sysd.system.nix-ld.enable = mkEnableOption "Enables nix-ld";
+  };
+  config = mkIf cfg.enable {
+    programs.nix-ld = {
+      enable = true;
+      # Sets up all the libraries to load
+      libraries = with pkgs; [
+        stdenv.cc.cc
+        openssl
+        xorg.libXcomposite
+        xorg.libXtst
+        xorg.libXrandr
+        xorg.libXext
+        xorg.libX11
+        xorg.libXfixes
+        libGL
+        libva
+        xorg.libxcb
+        xorg.libXdamage
+        xorg.libxshmfence
+        xorg.libXxf86vm
+        libelf
+        glib
+        gtk3
+        bzip2
+        xorg.libXinerama
+        xorg.libXcursor
+        xorg.libXrender
+        xorg.libXScrnSaver
+        xorg.libXi
+        xorg.libSM
+        xorg.libICE
+        gnome2.GConf
+        nspr
+        nss
+        cups
+        libcap
+        SDL2
+        libusb1
+        dbus-glib
+        ffmpeg
+        libudev0-shim
+        xorg.libXt
+        xorg.libXmu
+        libogg
+        libvorbis
+        SDL
+        SDL2_image
+        glew110
+        libidn
+        tbb
+        flac
+        freeglut
+        libjpeg
+        libpng
+        libpng12
+        libsamplerate
+        libmikmod
+        libtheora
+        libtiff
+        pixman
+        speex
+        SDL_image
+        SDL_ttf
+        SDL_mixer
+        SDL2_ttf
+        SDL2_mixer
+        libappindicator-gtk2
+        libdbusmenu-gtk2
+        libindicator-gtk2
+        libcaca
+        libcanberra
+        libgcrypt
+        libvpx
+        librsvg
+        xorg.libXft
+        libvdpau
+        gnome2.pango
+        cairo
+        atk
+        gdk-pixbuf
+        fontconfig
+        freetype
+        dbus
+        alsaLib
+        expat
+        libdrm
+        mesa
+        libxkbcommon
+      ];
+    };
+  };
+}

system/modules/sysd/system/pcscd/default.nix

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

system/modules/sysd/system/pipewire/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.pipewire;
+  cfg = config.modules.sysd.system.pipewire;
 in {
   options = {
-    modules.sysd.pipewire.enable = mkEnableOption "Enables pipewire";
+    modules.sysd.system.pipewire.enable = mkEnableOption "Enables pipewire";
   };
   config = mkIf cfg.enable {
     hardware.pulseaudio.enable = false;

system/modules/sysd/system/powerd/default.nix

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

system/modules/sysd/system/udisks/default.nix

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

system/modules/sysd/system/zram/default.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.modules.sysd.system.zram;
+in {
+  options = {
+    modules.sysd.system.zram.enable = mkEnableOption "Enables zram";
+  };
+  config = mkIf cfg.enable {
+    zramSwap.enable = true;
+  };
+}