hosts/othalan/pkgs.nix

@@ -8,6 +8,5 @@
       cachix
       graphviz
       typst
-      charm-freeze
     ]);
 }

pkgs/oizys-nim/src/oizys.nim

@@ -33,16 +33,16 @@ overlay:
     echo nixosConfigAttrs().join(" ")
 
   proc update(yes: bool = false) =
-    ## *TBI* update and run nixos-rebuild
+    ## *TBD* update and run nixos-rebuild
     fatal "not implemented"
 
   proc build(minimal: bool = false) =
     ## nix build
     nixBuild(minimal, rest)
 
-  proc cache(minimal: bool = false, name: string = "daylin") =
+  proc cache(name: string = "daylin") =
-    ## build and push to cachix
+    ## *TBD* build and push to cachix
-    nixBuildWithCache(minimal, name, rest)
+    fatal "not implemented"
 
   proc osCmd() =
     ## nixos-rebuild
@@ -52,11 +52,12 @@ overlay:
       error (
         &"unknown nixos-rebuild subcmd: {subcmd}\nexpected one of: \n" &
         nixosSubcmds.mapIt("  " & it).join("\n")
-      ); quit QuitFailure
+      )
+      quit QuitFailure
     nixosRebuild(subcmd, rest[1..^1])
 
   proc ci(`ref`: string = "main") =
-    ## trigger GHA update flow
+    ## *TBD* trigger GHA update flow
     if rest.len == 0:
       fatal "expected workflow file name"; quit QuitFailure
     createDispatch(rest[0], `ref`)
@@ -66,7 +67,7 @@ proc checkExes() =
     quit("oizys requires nix", QuitFailure)
 
 proc `//`(t1: Table[string, string], t2: Table[string, string]): Table[string, string] =
-  # nix style shallow table merge
+  # nix style table merge
   for k, v in t1.pairs(): result[k] = v
   for k, v in t2.pairs(): result[k] = v
 

pkgs/oizys-nim/src/oizys/exec.nim

@@ -6,7 +6,7 @@ import std/[
 import ./spin
 
 
-func addArgs*(cmd: var string, args: openArray[string]) =
+func addArgs*(cmd: var string, args: seq[string]) =
   cmd &= " " & args.join(" ")
 
 func addArg*(cmd: var string, arg: string) =

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

@@ -38,7 +38,7 @@ const defaultFlushThreshold = lvlAll
 proc genFmtStr(
   fmtPrefix, fmtSep, fmtSuffix, levelBb: string,
   level: Level
-): string =
+  ): string =
   var parts: seq[string]
   if fmtPrefix != "": parts.add fmtPrefix
   parts.add $LevelNames[level].bb(levelBb)
@@ -58,8 +58,8 @@ proc newFancyConsoleLogger*(
   warnBb: string = "bold yellow",
   errorBb: string = "bold red",
   fatalBb: string = "bold red"
-): FancyConsoleLogger =
+  ): FancyConsoleLogger =
-  ## Creates a new `FancyConsoleLogger<#ConsoleLogger>`_.
+  ## Creates a new `ColoredConsoleLogger<#ConsoleLogger>`_.
   new result
   let fmtStrs: array[Level, string] = [
       genFmtStr(fmtPrefix,fmtSep, fmtSuffix, "", lvlAll),

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

@@ -203,12 +203,10 @@ proc nixBuildHostDry*(minimal: bool, rest: seq[string]) =
       quit "exiting...", QuitSuccess
     cmd.addArgs drvs
     cmd.addArg "--no-link"
-
     if isCi():
       writeDervationsToStepSummary drvs
   else:
     cmd.addArgs nixosConfigAttrs()
-
   cmd.addArg "--dry-run"
   cmd.addArgs rest
   let (_, err) =
@@ -216,35 +214,4 @@ proc nixBuildHostDry*(minimal: bool, rest: seq[string]) =
   let output = parseDryRunOutput err
   display output
 
-# TODO: Add to bbansi
-template `bbfmt`(pattern: static string): untyped =
-  bb(fmt(pattern))
-
-proc nixBuildWithCache*(minimal: bool, name: string, rest:seq[string]) =
-  if findExe("cachix") == "":
-    fatal "is cachix installed?"; quit QuitFailure
-  info bbfmt"building and pushing to cache: [b]{name}"
-  var cmd = "cachix"
-  cmd.addArgs ["watch-exec","--"]
-  cmd.addArg "nix build"
-  if minimal:
-    debug "populating args with derivations not built/cached"
-    let drvs = systemPathDrvsToBuild()
-    if drvs.len == 0:
-      info "nothing to build"
-      quit "exiting...", QuitSuccess
-    cmd.addArgs drvs
-    cmd.addArg "--no-link"
-  else:
-    cmd.addArgs nixosConfigAttrs()
-  cmd.addArgs rest
-  debug cmd
-  quit QuitSuccess
-  let err = runCmd(cmd)
-  quit err
-
-
-
-
-