update hwylterm

pkgs/oizys/default.nix

@@ -8,7 +8,7 @@ buildNimblePackage {
   version = "unstable";
   src = lib.cleanSource ./.;
   nativeBuildInputs = [ openssl ];
-  nimbleDepsHash = "sha256-wuTGoswuAxAOOPDDI6Ma8Xzq1CApCfT+fAQmJg+VeYM=";
+  nimbleDepsHash = "sha256-DE5PAgcntxMwmgd7NnabYhOBH5szSvwPM9sNdnF/Iyc=";
   meta = {
     description = "nix begat oizys";
   };

pkgs/oizys/nimble.lock

@@ -3,12 +3,12 @@
   "packages": {
     "hwylterm": {
       "version": "0.1.0",
-      "vcsRevision": "73d58a23598ccd1c4c9c3335599c4e0a9b2ebeb9",
+      "vcsRevision": "6a6bd269f2dc385b5711b1a29246883144bccb4f",
       "url": "https://github.com/daylinmorgan/hwylterm",
       "downloadMethod": "git",
       "dependencies": [],
       "checksums": {
-        "sha1": "2ce648bd381834cf865e75f8326e7445d332b9c3"
+        "sha1": "e484311567eca66268ebe2ffd9dbb768025277ae"
       }
     },
     "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#73d58a23"
+requires "https://github.com/daylinmorgan/hwylterm#6a6bd269"
 

pkgs/oizys/src/oizys.nim

@@ -28,6 +28,7 @@ hwylCli:
     `reset-cache`:
       ? "set cache timeout to 0"
       ident resetCache
+
     [misc]
     yes:
       - y
@@ -157,45 +158,44 @@ hwylCli:
         updateRepo()
         nixosRebuild(NixosRebuildSubcmd.switch)
 
-    [utils]
+    # [utils]
+    # ... """
+    # less common utils operations
+    #
+    # some snippets I've reimplemented in nim so that nix isn't as annoying
+    # """
+    [hash]
+    ... "collect build hash from failure"
+    positionals:
+      installable string
+    run:
+      stdout.write getBuildHash(installable)
+
+    [narinfo]
     ... """
-    less common utils operations
+    check active caches for nix derivation
 
-    some snippets I've reimplemented in nim so that nix isn't as annoying
+    by default will use [yellow]nix config show[/] to determine
+    the binary cache urls
     """
-    subcommands:
+    positionals:
-      [hash]
+      installables seq[string]
-      ... "collect build hash from failure"
+    flags:
-      positionals:
+      cache:
-        installable string
+        ? "url of nix binary cache, can be repeated"
-      run:
+        T seq[string]
-        stdout.write getBuildHash(installable)
+    run:
+      if installables.len == 0:
+        fatalQuit "expected at least one positional argument"
+      checkForCache(installables, cache)
 
-      [narinfo]
+    [lock]
-      ... """
+    ... """
-      check active caches for nix derivation
+    check lock status for duplicates
 
-      by default will use [yellow]nix config show[/] to determine
+    currently just runs `jq < flake.lock '.nodes | keys[] | select(contains("_"))' -r`
-      the binary cache urls
+    """
-      """
+    run:
-      positionals:
+      # use absolute value for flake.lock?
-        installables seq[string]
+      quitWithCmd("""jq '.nodes | keys[] | select(contains("_"))' -r flake.lock""")
-      flags:
-        cache:
-          ? "url of nix binary cache, can be repeated"
-          T seq[string]
-      run:
-        if installables.len == 0: 
-          fatalQuit "expected at least one positional argument"
-        checkForCache(installables, cache)
-
-      [lock]
-      ... """
-      check lock status for duplicates
-
-      currently just runs `jq < flake.lock '.nodes | keys[] | select(contains("_"))' -r`
-      """
-      run:
-        # use absolute value for flake.lock?
-        quitWithCmd("""jq '.nodes | keys[] | select(contains("_"))' -r flake.lock""")
 

pkgs/oizys/src/oizys/utils.nim

@@ -1,6 +1,6 @@
 import std/[strformat, strutils, osproc, sugar, httpclient, terminal, wordwrap]
 import hwylterm
-import ./[nix, exec, logging, context]
+import ./[nix, exec, logging]
 
 
 # TODO: refactor runCmdCaptWithSpinner so it works in getBuildHash