daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-22 10:10:45 -06:00
Code Issues Projects Releases Packages Wiki Activity

semantics

Browse source
This commit is contained in:
Daylin Morgan 2024-09-03 12:01:32 -05:00
parent 0b0132ee6d
commit dba9b0c0e1
Signed by: daylin
GPG key ID: 950D13E9719334AD
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/oizys-nim/src/oizys.nim
View file

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

6
pkgs/oizys-nim/src/oizys/logging.nim
View file

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