refractoring modules without .enable

home/modules/userd/sops/default.nix

@@ -15,17 +15,17 @@ in {
   options = {
     modules.userd.sops = {
       enable = mkEnableOption "Enables sops home environment";
-      cnst = mkOption {
+      cnst.enable = mkOption {
         type = lib.types.bool;
         default = false;
         description = "Apply cnst sops settings";
       };
-      toothpick = mkOption {
+      toothpick.enable = mkOption {
         type = lib.types.bool;
         default = false;
         description = "Apply toothpick sops settings";
       };
-      adam = mkOption {
+      adam.enable = mkOption {
         type = lib.types.bool;
         default = false;
         description = "Apply adam sops settings";
@@ -41,7 +41,7 @@ in {
           sshKeyPaths = [];
         };
       }
-      (mkIf cfg.cnst {
+      (mkIf cfg.cnst.enable {
         age = {sshKeyPaths = ["/home/cnst/.ssh/id_ed25519"];};
         secrets = {
           openai_api_key = {
@@ -54,7 +54,7 @@ in {
           };
         };
       })
-      (mkIf cfg.toothpick {
+      (mkIf cfg.toothpick.enable {
         age = {sshKeyPaths = ["/home/toothpick/.ssh/id_ed25519"];};
         secrets = {
           openai_api_key = {
@@ -67,7 +67,7 @@ in {
           };
         };
       })
-      (mkIf cfg.adam {
+      (mkIf cfg.adam.enable {
         age = {sshKeyPaths = ["/home/adam/.ssh/id_ed25519"];};
         secrets = {
           openai_api_key = {

home/users/cnst/modules.nix

@@ -47,7 +47,7 @@
     userd = {
       sops = {
         enable = true;
-        cnst = true;
+        cnst.enable = true;
       };
       copyq.enable = true;
       mako.enable = true;

hosts/cnix/modules.nix

@@ -52,7 +52,7 @@
       samba.enable = false;
       sops = {
         enable = true;
-        cnix = true;
+        cnix.enable = true;
       };
       ssh.enable = true;
       udisks.enable = true;

system/modules/sysd/sops/default.nix

@@ -11,17 +11,17 @@ in {
   options = {
     modules.sysd.sops = {
       enable = mkEnableOption "Enables sops system environment";
-      cnix = mkOption {
+      cnix.enable = mkOption {
         type = lib.types.bool;
         default = false;
         description = "Apply cnix sops settings";
       };
-      toothpc = mkOption {
+      toothpc.enable = mkOption {
         type = lib.types.bool;
         default = false;
         description = "Apply toothpc sops settings";
       };
-      adampad = mkOption {
+      adampad.enable = mkOption {
         type = lib.types.bool;
         default = false;
         description = "Apply adampad sops settings";
@@ -38,7 +38,7 @@ in {
           sshKeyPaths = [];
         };
       }
-      (mkIf cfg.cnix {
+      (mkIf cfg.cnix.enable {
         secrets = {
           openai_api_key = {
             format = "yaml";
@@ -50,7 +50,7 @@ in {
           };
         };
       })
-      (mkIf cfg.toothpc {
+      (mkIf cfg.toothpc.enable {
         secrets = {
           openai_api_key = {
             format = "yaml";
@@ -62,7 +62,7 @@ in {
           };
         };
       })
-      (mkIf cfg.adampad {
+      (mkIf cfg.adampad.enable {
         secrets = {
           openai_api_key = {
             format = "yaml";