flake.lock

@@ -357,11 +357,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1727900725,
+        "lastModified": 1727714556,
-        "narHash": "sha256-yS4oC5G/FKrsrRjk03cGzTEXHAwfjP7azFHoKvlFfD8=",
+        "narHash": "sha256-l4cPDA3xGtGdQmdSCAO2VyWg9xwW6//KwDYefdWtovQ=",
         "ref": "refs/heads/main",
-        "rev": "de68e065fe861d7ca01eca267df4c305bc6e73c2",
+        "rev": "5c6c300abfea2539ffad9bcbf857325eec5ab765",
-        "revCount": 5287,
+        "revCount": 5285,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland/"
@@ -845,11 +845,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1727812556,
+        "lastModified": 1727710797,
-        "narHash": "sha256-U9cEs2W0eLvIS0kEMBGP8eZMdrpoHqynByth/mu2Nvc=",
+        "narHash": "sha256-2Xr8tAZoLrMkvD0Sil6053x2Lbsy8cvmlk8sApSWdD0=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "a40e6b047b6166aed5fab801e99a8d6b980d4680",
+        "rev": "50e4446e6dce9e1e52455f5b87bb91e83a538468",
         "type": "github"
       },
       "original": {
@@ -892,11 +892,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1727802920,
+        "lastModified": 1727634051,
-        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
+        "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
+        "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
         "type": "github"
       },
       "original": {
@@ -977,11 +977,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727969805,
+        "lastModified": 1727382008,
-        "narHash": "sha256-eotOuafJ+KcfEYuZVYYTdcj0ST3RG+GOEsomkOQqYp0=",
+        "narHash": "sha256-t9SNSBXzECHI5KdWbJXsN2ATpXqq7JBGag/1BgY3yfE=",
         "owner": "daylinmorgan",
         "repo": "pixi-flake",
-        "rev": "d4ea6b52b804cd20d4b661b568389e35e372e2f5",
+        "rev": "935278026a29a12589bb594533905d329bd16a9d",
         "type": "github"
       },
       "original": {
@@ -1001,11 +1001,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1727866937,
+        "lastModified": 1727785014,
-        "narHash": "sha256-kGYrBpSQ4zdPrV10gVemCKk3zKBW6XeC5wROcped8Ms=",
+        "narHash": "sha256-u9R0Atlcy1Y+r63zk66rjOwMij30ZLwoo6l1k7+OI08=",
         "owner": "roc-lang",
         "repo": "roc",
-        "rev": "2c62f773efaa08302dd8e765f4dba91a0cdbde8d",
+        "rev": "aaeefc09b60313a28597372d3fdec041c1b96a22",
         "type": "github"
       },
       "original": {

pkgs/oizys-nim/default.nix

@@ -8,5 +8,5 @@ buildNimblePackage {
   verions = "unstable";
   src = lib.cleanSource ./.;
   nativeBuildInputs = [ openssl ];
-  nimbleDepsHash = "sha256-RceRnhEkei3RfSCTOJsIiw4GSCyhOZhKoEVHNSw/KvA=";
+  nimbleDepsHash = "sha256-3p+PdGkQmKwz5tzJwX0aun3kSOLw/lwzqRkR9+6ECQE=";
 }

pkgs/oizys-nim/nimble.lock

@@ -13,12 +13,12 @@
     },
     "hwylterm": {
       "version": "0.1.0",
-      "vcsRevision": "7e82f7ba5a24d816a79b3a5ea49f32b4c7a5ef7e",
+      "vcsRevision": "d852761831bd748db24b42f15bc8e2d286232295",
       "url": "https://github.com/daylinmorgan/hwylterm",
       "downloadMethod": "git",
       "dependencies": [],
       "checksums": {
-        "sha1": "d6d97bdff3fcdfcf4b39b144fa5f27a6b9f9494d"
+        "sha1": "7de2a93a03bd0659d8d70cc7c08315e0a7f15439"
       }
     },
     "jsony": {

pkgs/oizys-nim/src/oizys.nim

@@ -1,8 +1,13 @@
 ## nix begat oizys
 import std/[os, tables, sequtils, strformat, strutils]
 import hwylterm, hwylterm/[cligen, logging]
-import oizys/[context, github, nix, overlay, logging]
+import oizys/[context, github, nix, overlay]# 3, logging
 
+addHandler(
+  newFancyConsoleLogger(
+    fmtPrefix = $bb"[b magenta]oizys"
+  )
+)
 
 proc confirm(q: string): bool =
   stderr.write $(q & bb"[yellow] (Y/n) ")
@@ -23,7 +28,7 @@ overlay:
     resetCache: bool = false,
     rest: seq[string],
   ) =
-    setupLoggers(debug)
+    if not debug: setLogFilter(lvlInfo)
     updateContext(host, flake, debug, resetCache)
 
   proc dry(minimal: bool = false) =
@@ -77,6 +82,16 @@ proc checkExes() =
   if findExe("nix") == "":
     fatalQuit "oizys requires nix"
 
+func `//`[A, B](pairs: openArray[(A, B)]): Table[A, B] =
+  pairs.toTable()
+func `//`[A, B](t1: var Table[A,B], t2: Table[A,B]) =
+  for k, v in t2.pairs(): t1[k] = v
+func `//`[A, B](t1: Table[A, B], t2: Table[A, B]): Table[A, B] =
+  result // t1; result // t2
+func `//`[A, B](pairs: openArray[(A,B)], t2: Table[A,B]): Table[A,B] =
+  // pairs // t2
+
+
 
 when isMainModule:
   import cligen
@@ -100,15 +115,17 @@ when isMainModule:
       "name"       : "name of cachix binary cache"
     } // sharedHelp
   let
+    # clUse must be set here using clCfg doesn't seem to work with dispatchMutli ...
+    clUse* = $bb("$command $args\n${doc}[bold]Options[/]:\n$options")
     osUsage = $bb("$command [[subcmd] $args\n$doc[bold]Options[/]:\n$options")
 
   dispatchMulti(
-    [build,  help = sharedHelp, usage = clCfg.use ],
+    [build,  help = sharedHelp, usage = clUse ],
-    [cache,  help = cacheHelp , usage = clCfg.use ],
+    [cache,  help = cacheHelp , usage = clUse ],
-    [ci,     help = ciHelp    , usage = clCfg.use ],
+    [ci,     help = ciHelp    , usage = clUse ],
-    [dry,    help = sharedHelp, usage = clCfg.use ],
+    [dry,    help = sharedHelp, usage = clUse ],
     [osCmd,  help = sharedHelp, usage = osUsage, cmdName = "os"],
-    [output, help = sharedHelp, usage = clCfg.use],
+    [output, help = sharedHelp, usage = clUse],
-    [update, help = updateHelp, usage = clCfg.use],
+    [update, help = updateHelp, usage = clUse],
   )
 

pkgs/oizys-nim/src/oizys/logging.nim

@@ -1,45 +0,0 @@
-## nix begat oizys
-import std/[logging, os]
-import hwylterm, hwylterm/logging
-export logging
-
-
-proc getDataDir(): string =
-  ## Returns the data directory of the current user for applications.
-  # follows std/os.getCacheDir
-  # which in turn follows https://crates.io/crates/platform-dirs
-  result =
-    when defined(windows):
-      getEnv("LOCALAPPDATA")
-    elif defined(osx):
-      getEnv("XDG_DATA_HOME", getEnv("HOME") / "Library/Application Support")
-    else:
-      getEnv("XDG_DATA_HOME", getEnv("HOME") / ".local/share")
-
-  result.normalizePathEnd(false)
-
-proc getOizysLogPath(): string =
-  let dataDir = getDataDir()
-  createDir(dataDir / "oizys")
-  result = dataDir / "oizys" / "oizys.log"
-
-
-setLogFilter(lvlAll)
-
-proc setupLoggers*(debug: bool) =
-  let logLevel =
-    if not debug: lvlInfo
-    else: lvlAll
-  addHandler(
-    newFancyConsoleLogger(
-      fmtPrefix = $bb"[b magenta]oizys",
-      levelThreshold = logLevel
-    )
-  )
-  addHandler(
-    newRollingFileLogger(
-      getOizysLogPath(),
-      mode = fmAppend,
-      fmtStr = "$datetime | $levelid:"
-    )
-  )