use more flag groups

pkgs/oizys/default.nix

@@ -8,7 +8,7 @@ buildNimblePackage {
   verions = "unstable";
   src = lib.cleanSource ./.;
   nativeBuildInputs = [ openssl ];
-  nimbleDepsHash = "sha256-YCHyMyy6cvNZgsmxPgskbAMETHs4/bP2Cp6XbjfWm1k=";
+  nimbleDepsHash = "sha256-/H/HvnJqpDJcyVJ2rbn7PDSSoJB/TMr9yiIKxtB1O+E=";
 
   meta = {
     description = "nix begat oizys";

pkgs/oizys/nimble.lock

@@ -3,12 +3,12 @@
   "packages": {
     "hwylterm": {
       "version": "0.1.0",
-      "vcsRevision": "a4e0f3fc7b34bac8e448dd35f58012d07dd4a0d0",
+      "vcsRevision": "e8e090c5b76bc555231bda536193df6f92a54db2",
       "url": "https://github.com/daylinmorgan/hwylterm",
       "downloadMethod": "git",
       "dependencies": [],
       "checksums": {
-        "sha1": "848f75dc1bc910560e5e0038bf0a9ebf8d096385"
+        "sha1": "925aad3ce660979de7cdb2f58a31dc7ac693e34d"
       }
     },
     "jsony": {

pkgs/oizys/oizys.nimble

@@ -13,5 +13,5 @@ bin           = @["oizys"]
 requires "nim >= 2.0.8"
 requires "jsony"
 requires "zippy"
-requires "https://github.com/daylinmorgan/hwylterm#a4e0f3f"
+requires "https://github.com/daylinmorgan/hwylterm#e8e090c"
 

pkgs/oizys/src/oizys.nim

@@ -8,14 +8,15 @@ proc checkExes() =
     fatalQuit "oizys requires nix"
 
 checkexes()
+
 hwylCli:
   name "oizys"
-  globalFlags:
+  flags:
+    [global]
     flake "path/to/flake"
     host:
       T seq[string]
       ? "host(s) to build"
-      # - h conflicts with autoadded help short flag
     debug:
       T bool
       ? "enable debug mode"
@@ -24,6 +25,16 @@ hwylCli:
       T bool
       ? "set cache timeout to 0"
       - r
+    [yes]
+    yes:
+      T bool
+      ? "skip all confirmation prompts"
+    [minimal]
+    minimal:
+      T bool
+      ? "set minimal"
+      - m
+
   preSub:
     setupLoggers(debug)
     updateContext(host, flake, debug, resetCache)
@@ -32,10 +43,7 @@ hwylCli:
     --- build
     ... "nix build"
     flags:
-      minimal:
+      ^[minimal]
-        T bool
-        ? "set minimal"
-        - m
     run:
       nixBuild(minimal, args)
 
@@ -43,15 +51,15 @@ hwylCli:
     ... "build and push store paths"
     flags:
       name:
-        * "oizys"
         ? "name of binary cache"
+        * "oizys"
       service:
         ? "name of cache service"
         * "attic"
       jobs:
-        * countProcessors()
-        ? "jobs when pushing paths"
         T int
+        ? "jobs when pushing paths"
+        * countProcessors()
         - j
     run:
       nixBuildWithCache(name, args, service, jobs)
@@ -69,10 +77,7 @@ hwylCli:
     --- dry
     ... "dry run build"
     flags:
-      minimal:
+      ^[minimal]
-        T bool
-        ? "set minimal"
-        - m
     run:
       nixBuildHostDry(minimal, args)
 
@@ -91,19 +96,13 @@ hwylCli:
 
     --- output
     ... "nixos config attr"
-    flags:
-      yes:
-        T bool
-        ? "skip all confirmation prompts"
     run:
       echo nixosConfigAttrs().join(" ")
 
     --- update
     ... "update and run nixos-rebuild"
     flags:
-      yes:
+      ^[yes]
-        T bool
-        ? "skip all confirmation prompts"
       preview:
         T bool
         ? "show preview and exit"