replacing sops with agenix

hosts/cnix/modules.nix

@@ -1,71 +1,145 @@
 {
   modules = {
     gaming = {
-      steam.enable = true;
-      gamescope.enable = true;
-      lutris.enable = true;
+      steam = {
+        enable = true;
+      };
+      gamescope = {
+        enable = true;
+      };
+      lutris = {
+        enable = true;
+      };
       gamemode = {
         enable = true;
-        optimizeGpu = true;
+        optimizeGpu = {
+          enable = true;
+        };
       };
     };
     gui = {
-      gnome.enable = false;
-      hyprland.enable = true;
-    };
-    hardware = {
-      bluetooth.enable = true;
-      logitech.enable = true;
-      graphics = {
-        amd.enable = true;
-        nvidia.enable = false;
+      gnome = {
+        enable = false;
+      };
+      hyprland = {
+        enable = true;
       };
     };
-    network = {
-      enable = true;
-      hostName = "cnix";
-      interfaces = {
-        "enp7s0" = {
-          allowedTCPPorts = [22 80 443];
+    hardware = {
+      bluetooth = {
+        enable = true;
+      };
+      logitech = {
+        enable = true;
+      };
+      graphics = {
+        amd = {
+          enable = true;
+        };
+        nvidia = {
+          enable = false;
+        };
+      };
+      network = {
+        enable = true;
+        hostName = "cnix";
+        interfaces = {
+          "enp7s0" = {
+            allowedTCPPorts = [22 80 443];
+          };
         };
       };
     };
     studio = {
       blender = {
         enable = false;
-        hip = false;
+        hip = {
+          enable = false;
+        };
+      };
+      gimp = {
+        enable = true;
+      };
+      inkscape = {
+        enable = true;
       };
-      gimp.enable = true;
-      inkscape.enable = true;
     };
     sysd = {
-      blueman.enable = true;
-      dbus.enable = true;
-      fwupd.enable = true;
-      gnome-keyring.enable = true;
-      greetd.enable = true;
-      gvfs.enable = true;
-      locate.enable = true;
-      mullvad.enable = true;
-      pipewire.enable = true;
-      powerd.enable = true;
-      samba.enable = false;
-      sops = {
-        enable = false;
-        cnix.enable = false;
+      blueman = {
+        enable = true;
+      };
+      dbus = {
+        enable = true;
+      };
+      fwupd = {
+        enable = true;
+      };
+      gnome-keyring = {
+        enable = true;
+      };
+      greetd = {
+        enable = true;
+      };
+      gvfs = {
+        enable = true;
+      };
+      locate = {
+        enable = true;
+      };
+      mullvad = {
+        enable = true;
+      };
+      pipewire = {
+        enable = true;
+      };
+      powerd = {
+        enable = true;
+      };
+      samba = {
+        enable = false;
+      };
+      ssh = {
+        enable = true;
+      };
+      udisks = {
+        enable = true;
+      };
+      xserver = {
+        amd = {
+          hhkbse = {
+            enable = true;
+          };
+        };
       };
-      ssh.enable = true;
-      udisks.enable = true;
-      xserver.amd.hhkbse.enable = true;
     };
     utils = {
-      android.enable = true;
-      anyrun.enable = true;
-      corectrl.enable = true;
-      microfetch.enable = true;
-      nix-ld.enable = false;
-      misc.enable = true;
-      npm.enable = true;
+      agenix = {
+        enable = true;
+        cnix = {
+          enable = true;
+        };
+      };
+      android = {
+        enable = true;
+      };
+      anyrun = {
+        enable = true;
+      };
+      corectrl = {
+        enable = true;
+      };
+      microfetch = {
+        enable = true;
+      };
+      nix-ld = {
+        enable = false;
+      };
+      misc = {
+        enable = true;
+      };
+      npm = {
+        enable = true;
+      };
     };
   };
 }

hosts/default.nix

@@ -1,89 +1,88 @@
 # Yanked from fufexan!
-{ inputs
-, homeImports
-, self
-, ...
+{
+  inputs,
+  homeImports,
+  self,
+  ...
 }: {
-  flake.nixosConfigurations =
-    let
-      # custom paths
-      userConfig = "${self}/home";
-      systemConfig = "${self}/system";
-      hostConfig = "${self}/hosts";
+  flake.nixosConfigurations = let
+    # custom paths
+    userConfig = "${self}/home";
+    systemConfig = "${self}/system";
+    hostConfig = "${self}/hosts";
 
-      cnstConfig = "${self}/home/users/cnst";
-      toothpickConfig = "${self}/home/users/toothpick";
-      adamConfig = "${self}/home/users/adam";
+    cnstConfig = "${self}/home/users/cnst";
+    toothpickConfig = "${self}/home/users/toothpick";
+    adamConfig = "${self}/home/users/adam";
 
-      userModules = "${self}/home/modules";
-      systemModules = "${self}/system/modules";
+    userModules = "${self}/home/modules";
+    systemModules = "${self}/system/modules";
 
-      # shorten paths
-      inherit (inputs.nixpkgs.lib) nixosSystem;
-      mod = "${systemConfig}";
+    # shorten paths
+    inherit (inputs.nixpkgs.lib) nixosSystem;
+    mod = "${systemConfig}";
 
-      # get the basic config to build on top of
-      inherit (import "${systemConfig}") shared;
+    # get the basic config to build on top of
+    inherit (import "${systemConfig}") shared;
 
-      # get these into the module system
-      specialArgs = { inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig adamConfig userModules systemModules; };
-    in
-    {
-      cnix = nixosSystem {
-        inherit specialArgs;
-        modules =
-          shared
-          ++ [
-            ./cnix
-            "${mod}/boot/lanzaboote"
-            "${mod}/nix/nh/cnix"
-            {
-              home-manager = {
-                users.cnst.imports = homeImports."cnst@cnix";
-                extraSpecialArgs = specialArgs;
-              };
-            }
-            inputs.chaotic.nixosModules.default
-            inputs.sops-nix.nixosModules.sops
-            (import "${mod}/dev")
-          ];
-      };
-      toothpc = nixosSystem {
-        inherit specialArgs;
-        modules =
-          shared
-          ++ [
-            ./toothpc
-            "${mod}/boot/lanzaboote"
-            "${mod}/nix/nh/toothpc"
-            {
-              home-manager = {
-                users.toothpick.imports = homeImports."toothpick@toothpc";
-                extraSpecialArgs = specialArgs;
-              };
-            }
-            inputs.chaotic.nixosModules.default
-            inputs.sops-nix.nixosModules.sops
-            (import "${mod}/dev")
-          ];
-      };
-      adampad = nixosSystem {
-        inherit specialArgs;
-        modules =
-          shared
-          ++ [
-            ./adampad
-            "${mod}/boot"
-            "${mod}/nix/nh/adampad"
-            {
-              home-manager = {
-                users.adam.imports = homeImports."adam@adampad";
-                extraSpecialArgs = specialArgs;
-              };
-            }
-            inputs.chaotic.nixosModules.default
-            inputs.sops-nix.nixosModules.sops
-          ];
-      };
+    # get these into the module system
+    specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig adamConfig userModules systemModules;};
+  in {
+    cnix = nixosSystem {
+      inherit specialArgs;
+      modules =
+        shared
+        ++ [
+          ./cnix
+          "${mod}/boot/lanzaboote"
+          "${mod}/nix/nh/cnix"
+          {
+            home-manager = {
+              users.cnst.imports = homeImports."cnst@cnix";
+              extraSpecialArgs = specialArgs;
+            };
+          }
+          inputs.chaotic.nixosModules.default
+          inputs.agenix.nixosModules.default
+          (import "${mod}/dev")
+        ];
     };
+    toothpc = nixosSystem {
+      inherit specialArgs;
+      modules =
+        shared
+        ++ [
+          ./toothpc
+          "${mod}/boot/lanzaboote"
+          "${mod}/nix/nh/toothpc"
+          {
+            home-manager = {
+              users.toothpick.imports = homeImports."toothpick@toothpc";
+              extraSpecialArgs = specialArgs;
+            };
+          }
+          inputs.chaotic.nixosModules.default
+          inputs.agenix.nixosModules.default
+          (import "${mod}/dev")
+        ];
+    };
+    adampad = nixosSystem {
+      inherit specialArgs;
+      modules =
+        shared
+        ++ [
+          ./adampad
+          "${mod}/boot"
+          "${mod}/nix/nh/adampad"
+          {
+            home-manager = {
+              users.adam.imports = homeImports."adam@adampad";
+              extraSpecialArgs = specialArgs;
+            };
+          }
+          inputs.chaotic.nixosModules.default
+          inputs.agenix.nixosModules.default
+        ];
+    };
+  };
 }