models: Added default provider setting

Author: YPares

riglets/models.nix

@@ -1,21 +1,27 @@
 _:
-{ lib, ... }:
+{ lib, config, ... }:
+with lib.types;
 let
-  providerAndModel = with lib.types; {
-    providerId = lib.mkOption {
-      type = nullOr str;
-      description = "Model provider ID. Can be ignored depending on the entrypoint";
-      default = null;
-    };
-    modelId = lib.mkOption {
-      type = nullOr str;
-      description = "Model ID";
-      default = null;
-    };
+  cfg = config.models;
+
+  providerId = lib.mkOption {
+    type = nullOr str;
+    description = "Model provider ID. Can be ignored depending on the entrypoint";
+    default = cfg.providers.default;
+  };
+
+  modelId = lib.mkOption {
+    type = nullOr str;
+    description = "Model ID";
+    default = null;
+  };
+
+  providerAndModel = {
+    inherit providerId modelId;
   };
 in
 {
-  options.models = with lib.types; {
+  options.models = {
     default = providerAndModel;
 
     specialized = lib.mkOption {
@@ -25,14 +31,20 @@ in
     };
 
     providers = {
+      default = lib.mkOption {
+        type = nullOr str;
+        description = "Default model provider to use";
+        default = null;
+      };
+
       disabled = lib.mkOption {
         description = "Prevent these providers from being used";
         type = nullOr (listOf str);
-        default = null;
+        default = [ ];
       };
 
       enabled = lib.mkOption {
-        description = "Only allow these providers to be used";
+        description = "Only allow these providers to be used. Allow all if null";
         type = nullOr (listOf str);
         default = null;
       };

riglets/opencode.nix

@@ -113,18 +113,16 @@ in
             }
             // lib.optionalAttrs cmd.useSubAgent { subtask = true; }
           ) (lib.concatMapAttrs (k: v: { "rig:${k}" = v; }) rig.promptCommands);
-        }
-        // lib.optionalAttrs (config.models.default.modelId != null) {
-          model = toModelId config.models.default;
-        }
-        // lib.optionalAttrs (config.models.providers.disabled != null) {
+
+          agent = lib.mapAttrs (_agentName: mdl: { model = toModelId mdl; }) config.models.specialized;
+
           disabled_providers = config.models.providers.disabled;
         }
         // lib.optionalAttrs (config.models.providers.enabled != null) {
           enabled_providers = config.models.providers.enabled;
         }
-        // lib.optionalAttrs (config.models.specialized != { }) {
-          agent = lib.mapAttrs (_agentName: mdl: { model = toModelId mdl; }) config.models.specialized;
+        // lib.optionalAttrs (config.models.default.modelId != null) {
+          model = toModelId config.models.default;
         }
       );
     in

rigup.toml

@@ -60,9 +60,11 @@ extends.self = "example-rig-claude"
 [rigs.example-rig-opencode]
 extends.self = "example-rig"
 riglets.self = ["opencode"]
-config.models.default = { providerId = "opencode", modelId = "glm-4.7" }
-config.models.specialized.plan = { providerId = "opencode", modelId = "claude-opus-4-6" }
-config.models.specialized.explore = { providerId = "opencode", modelId = "kimi-k2.5-free" }
+config.models.providers.default = "opencode"
+config.models.providers.enabled = ["opencode"]
+config.models.default.modelId = "glm-4.7"
+config.models.specialized.plan.modelId = "claude-opus-4-6"
+config.models.specialized.explore.modelId = "kimi-k2.5-free"
 
 [rigs.example-rig-opencode.config.agent.personality]
 inspiration = "Fa Mulan"