flake.lock: Update

Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=04421063af2941c6e27e6dca2bdc2c387778a3a5' (2024-09-09)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=85da1a17d831e2b5db9c1c1e4ce6427d63563562' (2024-09-09)
• Updated input 'lix':
    'c14486ae8d.tar.gz?narHash=sha256-8tzJO3PllVPc0RYE0OfXVWlgTiJxKH1nzXsQLGyFRJ4%3D&rev=c14486ae8d3bbc862c625d948a6b2f4dc0927d5b' (2024-09-09)
  → '8f7ab26f96.tar.gz?narHash=sha256-/Q99Vj3w/8BDrlCA3Ncen2FXqjMPyGaWTkKoex2HxSk%3D&rev=8f7ab26f96ec025db3f922fc50f5184167662596' (2024-09-09)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/dc951da2b8fdaabc09a1bc72dd5744438976be47' (2024-09-09)
  → 'github:nix-community/nixpkgs-wayland/386a8eb790f34ee62eb475815fffe99613d74d1f' (2024-09-09)

flake.lock

@@ -323,11 +323,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1725873008,
+        "lastModified": 1725895184,
-        "narHash": "sha256-hVPjlB0EPbf98tm4LcwOmS80tO/qfAoXqXKWZjDUG50=",
+        "narHash": "sha256-VtrRnnmRaL/7ovFKYe5hXyYc3ZV6IQ8JVCxcnCT3iEs=",
         "ref": "refs/heads/main",
-        "rev": "04421063af2941c6e27e6dca2bdc2c387778a3a5",
+        "rev": "85da1a17d831e2b5db9c1c1e4ce6427d63563562",
-        "revCount": 5203,
+        "revCount": 5205,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland/"
@@ -504,11 +504,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1725846500,
+        "lastModified": 1725898463,
-        "narHash": "sha256-8tzJO3PllVPc0RYE0OfXVWlgTiJxKH1nzXsQLGyFRJ4=",
+        "narHash": "sha256-/Q99Vj3w/8BDrlCA3Ncen2FXqjMPyGaWTkKoex2HxSk=",
-        "rev": "c14486ae8d3bbc862c625d948a6b2f4dc0927d5b",
+        "rev": "8f7ab26f96ec025db3f922fc50f5184167662596",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c14486ae8d3bbc862c625d948a6b2f4dc0927d5b.tar.gz?rev=c14486ae8d3bbc862c625d948a6b2f4dc0927d5b"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8f7ab26f96ec025db3f922fc50f5184167662596.tar.gz?rev=8f7ab26f96ec025db3f922fc50f5184167662596"
       },
       "original": {
         "type": "tarball",
@@ -744,11 +744,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1725885379,
+        "lastModified": 1725891647,
-        "narHash": "sha256-gw+CYMQRqzErAIp4WOTTeX6YXOhgk9YWyTM1Sa2cACA=",
+        "narHash": "sha256-0PPiL9SbX9LuY3icYE6amlc5jCqme9QYi/d/r1FSaIU=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "dc951da2b8fdaabc09a1bc72dd5744438976be47",
+        "rev": "386a8eb790f34ee62eb475815fffe99613d74d1f",
         "type": "github"
       },
       "original": {

pkgs/oizys-nim/default.nix

@@ -8,5 +8,5 @@ buildNimblePackage {
   verions = "unstable";
   src = lib.cleanSource ./.;
   nativeBuildInputs = [ openssl ];
-  nimbleDepsHash = "sha256-KErXGNNU5VVBHcvBmBhbagxZabHzajY5dF2OLHPmWf8=";
+  nimbleDepsHash = "sha256-WeTbNoF+TuzWriqoHWk5DBVgBXtNBIBHMkwy8/+a2JA=";
 }

pkgs/oizys-nim/nimble.lock

@@ -30,6 +30,16 @@
       "checksums": {
         "sha1": "6aeb83e7481ca8686396a568096054bc668294df"
       }
+    },
+    "zippy": {
+      "version": "0.10.16",
+      "vcsRevision": "a99f6a7d8a8e3e0213b3cad0daf0ea974bf58e3f",
+      "url": "https://github.com/guzba/zippy",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "da3bb5ea388f980babcc29760348e2899d29a639"
+      }
     }
   },
   "tasks": {}

pkgs/oizys-nim/oizys.nimble

@@ -13,4 +13,5 @@ bin           = @["oizys"]
 requires "nim >= 2.0.8"
 requires "cligen"
 requires "jsony"
+requires "zippy"
 requires "https://github.com/daylinmorgan/bbansi#9a85d9e"

pkgs/oizys-nim/src/oizys.nim

@@ -46,24 +46,23 @@ overlay:
 
   proc osCmd() =
     ## nixos-rebuild
-    if len(rest) == 0: quit "please provide subcmd"
+    if len(rest) == 0: fatalQuit "please provide subcmd"
     let subcmd = rest[0]
     if subcmd notin nixosSubcmds:
-      error (
+      fatalQuit(
         &"unknown nixos-rebuild subcmd: {subcmd}\nexpected one of: \n" &
         nixosSubcmds.mapIt("  " & it).join("\n")
-      ); quit QuitFailure
+      )
     nixosRebuild(subcmd, rest[1..^1])
 
   proc ci(`ref`: string = "main") =
     ## trigger GHA update flow
-    if rest.len == 0:
+    if rest.len == 0: fatalQuit "expected workflow file name"
-      fatal "expected workflow file name"; quit QuitFailure
     createDispatch(rest[0], `ref`)
 
 proc checkExes() =
   if findExe("nix") == "":
-    quit("oizys requires nix", QuitFailure)
+    fatalQuit "oizys requires nix"
 
 proc `//`(t1: Table[string, string], t2: Table[string, string]): Table[string, string] =
   # nix style shallow table merge

pkgs/oizys-nim/src/oizys/context.nim

@@ -1,6 +1,8 @@
 import std/[logging, os, strformat, strutils]
 from std/nativesockets import getHostname
 
+import ./logging
+
 type
   OizysContext* = object
     flake, host: string
@@ -24,8 +26,7 @@ var oc = initContext()
 proc checkPath(s: string): string = 
   ## fail if path doesn't exist
   if not s.dirExists:
-    error fmt"flake path: {s} does not exist"
+    errorQuit fmt"flake path: {s} does not exist"
-    quit()
   s
 
 # public api -------------------------------------
@@ -44,6 +45,7 @@ proc updateContext*(
     oc.flake =
       if flake.startsWith("github") or flake.startsWith("git+"): flake
       else: checkPath(flake.normalizedPath().absolutePath())
+  debug oc
 
 proc getHosts*(): seq[string] = return oc.hosts
 proc getFlake*(): string = return oc.flake

pkgs/oizys-nim/src/oizys/github.nim

@@ -1,7 +1,11 @@
 import std/[httpclient,logging, os, strformat, strutils, json]
+import ./logging
 
 var ghToken = getEnv("GITHUB_TOKEN")
 
+proc checkToken() {.inline.} =
+  if ghToken == "": fatalQuit "GITHUB_TOKEN not set"
+
 #[curl -L \
   -X POST \
   -H "Accept: application/vnd.github+json" \
@@ -11,16 +15,17 @@ var ghToken = getEnv("GITHUB_TOKEN")
   -d '{"ref":"topic-branch","inputs":{"name":"Mona the Octocat","home":"San Francisco, CA"}}'
 ]#
 
+
 proc postGhApi(url: string, body: JsonNode) =
-  if ghToken == "": fatal "GITHUB_TOKEN not set"; quit QuitFailure
+  checkToken()
   let client = newHttpClient()
   client.headers = newHttpHeaders({
     "Accept"              : "application/vnd.github+json",
     "Authorization"       : fmt"Bearer {ghToken}",
     "X-GitHub-Api-Version": "2022-11-28",
   })
-  let response = client.post(url, body = $body)
   try:
+    let response = client.post(url, body = $body)
     info fmt"Status: {response.code}"
   except:
     error "failed to get response code"

pkgs/oizys-nim/src/oizys/ignored.txt

@@ -19,3 +19,4 @@ restic-gdrive
 gitea
 lock
 code
+comma-with-db

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

@@ -106,3 +106,12 @@ method log*(logger: FancyConsoleLogger, level: Level, args: varargs[string, `$`]
 
 proc addHandlers*(handler: Logger) =
   handlers.add(handler)
+
+template errorQuit*(args: varargs[string, `$`]) =
+  error args
+  quit QuitFailure
+
+template fatalQuit*(args: varargs[string, `$`]) =
+  error args
+  quit QuitFailure
+

pkgs/oizys-nim/src/oizys/nix.nim

@@ -4,7 +4,7 @@ import std/[
   strutils, sugar, logging, tables
 ]
 import bbansi, jsony
-import ./[context, exec]
+import ./[context, exec, logging]
 
 
 proc nixCommand(cmd: string): string =
@@ -23,10 +23,9 @@ const nixosSubcmds* =
   repl build-vm build-vm-with-bootloader list-generations""".splitWhitespace()
 
 proc nixosRebuild*(subcmd: string, rest: seq[string] = @[]) =
-  var cmd = fmt"sudo nixos-rebuild {subcmd} --flake {getFlake()} --log-format multiline"
   if getHosts().len > 1:
-    error "nixos-rebuild only supports one host"
+    fatalQuit "nixos-rebuild only supports one host"
-    quit QuitFailure
+  var cmd = fmt"sudo nixos-rebuild {subcmd} --flake {getFlake()} --log-format multiline"
   cmd.addArgs rest
   quitWithCmd cmd
 
@@ -77,8 +76,8 @@ proc parseDryRunOutput(err: string): DryRunOutput =
         stderr.writeLine err
         quit()
     of 0:
-      info "nothing to do";
+      info "nothing to do"
-      quit(QuitSuccess)
+      quit QuitSuccess
     else:
       fatal "unexpected output from nix"
       stderr.writeLine err
@@ -88,7 +87,7 @@ proc parseDryRunOutput(err: string): DryRunOutput =
   result.toFetch.sort(cmpDrv)
 
 proc trunc(s: string, limit: int): string =
-  if s.len <= limit: 
+  if s.len <= limit:
     s
   else:
     s[0..(limit-4)] & "..."
@@ -175,9 +174,7 @@ proc writeDervationsToStepSummary(drvs: seq[string]) =
       fmt"| {name} | {hash} |"
   )
   let summaryFilePath = getEnv("GITHUB_STEP_SUMMARY")
-  if summaryFilePath == "":
+  if summaryFilePath == "": fatalQuit "no github step summary found"
-    fatal "no github step summary found"
-    quit QuitFailure
   let output = open(summaryFilePath,fmAppend)
   output.writeLine("| derivation | hash |\n|---|---|")
   output.writeLine(rows.join("\n"))
@@ -217,7 +214,7 @@ proc nixBuildHostDry*(minimal: bool, rest: seq[string]) =
   cmd.addArg "--dry-run"
   cmd.addArgs rest
   let (_, err) =
-    runCmdCaptWithSpinner(cmd, "evaluating derivation for: " & getHosts().join(" "))
+    runCmdCaptWithSpinner(cmd, "evaluating derivation for: " & getHosts().join(" "), {CaptStderr})
   let output = parseDryRunOutput err
   display output
 
@@ -226,8 +223,7 @@ template `bbfmt`(pattern: static string): untyped =
   bb(fmt(pattern))
 
 proc nixBuildWithCache*(minimal: bool, name: string, rest:seq[string]) =
-  if findExe("cachix") == "":
+  if findExe("cachix") == "": fatalQuit "is cachix installed?"
-    fatal "is cachix installed?"; quit QuitFailure
   info bbfmt"building and pushing to cache: [b]{name}"
   var cmd = "cachix"
   cmd.addArgs ["watch-exec","--"]

pkgs/oizys-nim/src/oizys/spin.nim

@@ -1,49 +1,6 @@
 import std/[os, locks, sequtils, terminal]
 
-# https://github.com/molnarmark/colorize
+import bbansi
-proc reset(): string = "\e[0m"
-
-# foreground colors
-proc fgRed*(s: string): string = "\e[31m" & s & reset()
-proc fgBlack*(s: string): string = "\e[30m" & s & reset()
-proc fgGreen*(s: string): string = "\e[32m" & s & reset()
-proc fgYellow*(s: string): string = "\e[33m" & s & reset()
-proc fgBlue*(s: string): string = "\e[34m" & s & reset()
-proc fgMagenta*(s: string): string = "\e[35m" & s & reset()
-proc fgCyan*(s: string): string = "\e[36m" & s & reset()
-proc fgLightGray*(s: string): string = "\e[37m" & s & reset()
-proc fgDarkGray*(s: string): string = "\e[90m" & s & reset()
-proc fgLightRed*(s: string): string = "\e[91m" & s & reset()
-proc fgLightGreen*(s: string): string = "\e[92m" & s & reset()
-proc fgLightYellow*(s: string): string = "\e[93m" & s & reset()
-proc fgLightBlue*(s: string): string = "\e[94m" & s & reset()
-proc fgLightMagenta*(s: string): string = "\e[95m" & s & reset()
-proc fgLightCyan*(s: string): string = "\e[96m" & s & reset()
-proc fgWhite*(s: string): string = "\e[97m" & s & reset()
-
-# background colors
-proc bgBlack*(s: string): string = "\e[40m" & s & reset()
-proc bgRed*(s: string): string = "\e[41m" & s & reset()
-proc bgGreen*(s: string): string = "\e[42m" & s & reset()
-proc bgYellow*(s: string): string = "\e[43m" & s & reset()
-proc bgBlue*(s: string): string = "\e[44m" & s & reset()
-proc bgMagenta*(s: string): string = "\e[45m" & s & reset()
-proc bgCyan*(s: string): string = "\e[46m" & s & reset()
-proc bgLightGray*(s: string): string = "\e[47m" & s & reset()
-proc bgDarkGray*(s: string): string = "\e[100m" & s & reset()
-proc bgLightRed*(s: string): string = "\e[101m" & s & reset()
-proc bgLightGreen*(s: string): string = "\e[102m" & s & reset()
-proc bgLightYellow*(s: string): string = "\e[103m" & s & reset()
-proc bgLightBlue*(s: string): string = "\e[104m" & s & reset()
-proc bgLightMagenta*(s: string): string = "\e[105m" & s & reset()
-proc bgLightCyan*(s: string): string = "\e[106m" & s & reset()
-proc bgWhite*(s: string): string = "\e[107m" & s & reset()
-
-# formatting functions
-proc bold*(s: string): string = "\e[1m" & s & reset()
-proc underline*(s: string): string = "\e[4m" & s & reset()
-proc hidden*(s: string): string = "\e[8m" & s & reset()
-proc invert*(s: string): string = "\e[7m" & s & reset()
 
 type
   SpinnerKind* = enum
@@ -71,10 +28,10 @@ type
     frame: string
     interval: int
     customSymbol: bool
+    style: string
 
   EventKind = enum
-    Stop, StopSuccess, StopError,
+    Stop, SymbolChange, TextChange,
-    SymbolChange, TextChange,
 
   SpinnyEvent = object
     kind: EventKind
@@ -83,19 +40,21 @@ type
 var spinnyChannel: Channel[SpinnyEvent]
 
 proc newSpinny*(text: string, s: Spinner): Spinny =
+  let style = "bold blue"
   Spinny(
     text: text,
     running: true,
-    frames: s.frames,
+    frames: mapIt(s.frames, $bb(it, style)),
     customSymbol: false,
-    interval: s.interval
+    interval: s.interval,
+    style: "bold blue"
   )
 
 proc newSpinny*(text: string, spinType: SpinnerKind): Spinny =
   newSpinny(text, Spinners[spinType])
 
-proc setSymbolColor*(spinny: Spinny, color: proc(x: string): string) =
+proc setSymbolColor*(spinny: Spinny, style: string) =
-  spinny.frames = mapIt(spinny.frames, color(it))
+  spinny.frames = mapIt(spinny.frames, $bb(it, style))
 
 proc setSymbol*(spinny: Spinny, symbol: string) =
   spinnyChannel.send(SpinnyEvent(kind: SymbolChange, payload: symbol))
@@ -113,14 +72,6 @@ proc handleEvent(spinny: Spinny, eventData: SpinnyEvent): bool =
     spinny.frame = eventData.payload
   of TextChange:
     spinny.text = eventData.payload
-  of StopSuccess:
-    spinny.customSymbol = true
-    spinny.frame = "✔".bold.fgGreen
-    spinny.text = eventData.payload.bold.fgGreen
-  of StopError:
-    spinny.customSymbol = true
-    spinny.frame = "✖".bold.fgRed
-    spinny.text = eventData.payload.bold.fgRed
 
 proc spinnyLoop(spinny: Spinny) {.thread.} =
   var frameCounter = 0
@@ -147,7 +98,7 @@ proc spinnyLoop(spinny: Spinny) {.thread.} =
       stdout.write(spinny.frame & " " & spinny.text)
       stdout.flushFile()
 
-    sleep(spinny.interval)
+    sleep spinny.interval
 
     if frameCounter >= spinny.frames.len - 1:
       frameCounter = 0
@@ -155,14 +106,14 @@ proc spinnyLoop(spinny: Spinny) {.thread.} =
       frameCounter += 1
 
 proc start*(spinny: Spinny) =
-  initLock(spinny.lock)
+  initLock spinny.lock
   spinnyChannel.open()
   createThread(spinny.t, spinnyLoop, spinny)
 
 proc stop(spinny: Spinny, kind: EventKind, payload = "") =
   spinnyChannel.send(SpinnyEvent(kind: kind, payload: payload))
   spinnyChannel.send(SpinnyEvent(kind: Stop))
-  joinThread(spinny.t)
+  joinThread spinny.t
   eraseLine stdout
   flushFile stdout
 
@@ -170,15 +121,8 @@ proc stop(spinny: Spinny, kind: EventKind, payload = "") =
 proc stop*(spinny: Spinny) =
   spinny.stop(Stop)
 
-proc success*(spinny: Spinny, msg: string) =
-  spinny.stop(StopSuccess, msg)
-
-proc error*(spinny: Spinny, msg: string) =
-  spinny.stop(StopError, msg)
-
 template withSpinner*(msg: string = "", body: untyped): untyped =
   var spinner {.inject.} = newSpinny(msg, Dots)
-  spinner.setSymbolColor(fgBlue)
   if isatty(stdout): # don't spin if it's not a tty
     start spinner
 

pkgs/oizys-nim/todo.md

@@ -2,7 +2,7 @@
 
 - [x] nix commands including dry runs
 - [ ] gh api commands
-  - [ ] ci <- start with the easier one
+  - [x] ci <- start with the easier one
   - [ ] update
 
 <!-- generated with <3 by daylinmorgan/todo -->