mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-24 16:00:45 -06:00
Compare commits
No commits in common. "09aa87e51f47ff01b1ced9be6500f1eabc0ee0f3" and "e1799718b91b5cf3b43bc7ce80d8a1d617b01f18" have entirely different histories.
09aa87e51f
...
e1799718b9
6 changed files with 41 additions and 37 deletions
14
flake.lock
14
flake.lock
|
@ -504,11 +504,11 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726072500,
|
"lastModified": 1726016547,
|
||||||
"narHash": "sha256-VfnBb2oNwLsnKbeaGyhLx2aHU+3AS3tzMpW9VdZGzgo=",
|
"narHash": "sha256-tB4Y3Rrv67ZdEo3HJzxYL5XX9wqtvWwIX1z8k399W0s=",
|
||||||
"rev": "df0137226d7db4bfac455076be9f37dae6f01ffe",
|
"rev": "24db81eaf28259ab8f8334ccd6368673a26ed422",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/df0137226d7db4bfac455076be9f37dae6f01ffe.tar.gz?rev=df0137226d7db4bfac455076be9f37dae6f01ffe"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/24db81eaf28259ab8f8334ccd6368673a26ed422.tar.gz?rev=24db81eaf28259ab8f8334ccd6368673a26ed422"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -744,11 +744,11 @@
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726089853,
|
"lastModified": 1726058240,
|
||||||
"narHash": "sha256-cpP8CDvELczaYLY0RIfYu0vLC8kU/PgM46AZRDAQEe8=",
|
"narHash": "sha256-p74soeV48Sry7+wOxDJ8Gqx3JT26lH9AY4+slpJemyw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "ace4183b2665fa1b7acf1ce74a83519bbf828a58",
|
"rev": "5d6271a06b79364aa838cdc68c5852d383b17236",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -23,13 +23,11 @@ mkOizysModule config "chrome" {
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# (chromium.override {
|
(chromium.override {
|
||||||
# commandLineArgs = [ "--force-dark-mode" ];
|
|
||||||
# enableWideVine = true;
|
|
||||||
# })
|
|
||||||
|
|
||||||
(google-chrome.override {
|
|
||||||
commandLineArgs = [ "--force-dark-mode" ];
|
commandLineArgs = [ "--force-dark-mode" ];
|
||||||
|
enableWideVine = true;
|
||||||
})
|
})
|
||||||
|
|
||||||
|
(google-chrome.override { commandLineArgs = [ "--force-dark-mode" ]; })
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,19 +23,22 @@ proc initContext*(): OizysContext =
|
||||||
result.ci = getEnv("GITHUB_STEP_SUMMARY") != ""
|
result.ci = getEnv("GITHUB_STEP_SUMMARY") != ""
|
||||||
|
|
||||||
var oc = initContext()
|
var oc = initContext()
|
||||||
|
|
||||||
proc checkPath(s: string): string =
|
proc checkPath(s: string): string =
|
||||||
## fail if path doesn't exist
|
## fail if path doesn't exist
|
||||||
if not s.dirExists: fatalQuit fmt"flake path: {s} does not exist"
|
if not s.dirExists:
|
||||||
|
errorQuit fmt"flake path: {s} does not exist"
|
||||||
s
|
s
|
||||||
|
|
||||||
|
# public api -------------------------------------
|
||||||
|
|
||||||
proc updateContext*(
|
proc updateContext*(
|
||||||
host: seq[string],
|
host: seq[string],
|
||||||
flake: string,
|
flake: string,
|
||||||
debug: bool,
|
debug: bool,
|
||||||
resetCache: bool
|
resetCache: bool
|
||||||
) =
|
) =
|
||||||
if host.len > 0: oc.hosts = host
|
if host.len > 0:
|
||||||
|
oc.hosts = host
|
||||||
oc.debug = debug
|
oc.debug = debug
|
||||||
oc.resetCache = resetCache
|
oc.resetCache = resetCache
|
||||||
if flake != "":
|
if flake != "":
|
||||||
|
@ -46,9 +49,9 @@ proc updateContext*(
|
||||||
debug bb(fmt"""[b]flake[/]: {oc.flake}, [b]hosts[/]: {oc.hosts.join(" ")}""")
|
debug bb(fmt"""[b]flake[/]: {oc.flake}, [b]hosts[/]: {oc.hosts.join(" ")}""")
|
||||||
|
|
||||||
proc getHosts*(): seq[string] = return oc.hosts
|
proc getHosts*(): seq[string] = return oc.hosts
|
||||||
proc getFlake*(): string = return oc.flake
|
proc getFlake*(): string = return oc.flake
|
||||||
proc isDebug*(): bool = return oc.debug
|
proc isDebug*(): bool = return oc.debug
|
||||||
proc isResetCache*(): bool = return oc.resetCache
|
proc isResetCache*(): bool = return oc.resetCache
|
||||||
proc isCi*(): bool = return oc.ci
|
proc isCi*(): bool = return oc.ci
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -32,12 +32,12 @@ proc runCmdCapt*(
|
||||||
args = args[1..^1],
|
args = args[1..^1],
|
||||||
options = {poUsePath}
|
options = {poUsePath}
|
||||||
)
|
)
|
||||||
# NOTE: if I didn't use streams could I just read from the file handle instead?
|
|
||||||
let
|
let
|
||||||
outstrm = peekableOutputStream p
|
outstrm = peekableOutputStream p
|
||||||
errstrm = peekableErrorStream p
|
errstrm = peekableErrorStream p
|
||||||
result.exitCode = -1
|
result.exitCode = -1
|
||||||
var line: string
|
var line: string
|
||||||
|
# var cnt: int
|
||||||
while true:
|
while true:
|
||||||
if CaptStdout in capture:
|
if CaptStdout in capture:
|
||||||
if outstrm.readLine(line):
|
if outstrm.readLine(line):
|
||||||
|
@ -48,6 +48,9 @@ proc runCmdCapt*(
|
||||||
result.exitCode = peekExitCode(p)
|
result.exitCode = peekExitCode(p)
|
||||||
if result.exitCode != -1: break
|
if result.exitCode != -1: break
|
||||||
|
|
||||||
|
# result.exitCode = waitForExit p
|
||||||
|
# result.exitCode = waitForExit p
|
||||||
|
# close p
|
||||||
close p
|
close p
|
||||||
|
|
||||||
proc runCmdCaptWithSpinner*(
|
proc runCmdCaptWithSpinner*(
|
||||||
|
|
|
@ -10,9 +10,9 @@ when defined(amd64) and (defined(gcc) or defined(clang)):
|
||||||
template withTmpDir(body: untyped): untyped =
|
template withTmpDir(body: untyped): untyped =
|
||||||
let tmpDir {.inject.} = createTempDir("oizys","")
|
let tmpDir {.inject.} = createTempDir("oizys","")
|
||||||
body
|
body
|
||||||
removeDir tmpDir
|
removeDir(tmpDir)
|
||||||
|
|
||||||
var ghToken = getEnv "GITHUB_TOKEN"
|
var ghToken = getEnv("GITHUB_TOKEN")
|
||||||
|
|
||||||
proc checkToken() {.inline.} =
|
proc checkToken() {.inline.} =
|
||||||
if ghToken == "": fatalQuit "GITHUB_TOKEN not set"
|
if ghToken == "": fatalQuit "GITHUB_TOKEN not set"
|
||||||
|
@ -50,8 +50,7 @@ proc postGhApi(url: string, body: JsonNode) =
|
||||||
let response = client.post(url, body = $body)
|
let response = client.post(url, body = $body)
|
||||||
info fmt"Status: {response.code}"
|
info fmt"Status: {response.code}"
|
||||||
except:
|
except:
|
||||||
errorQuit "failed to get response code"
|
error "failed to get response code"
|
||||||
|
|
||||||
|
|
||||||
proc createDispatch*(workflowFileName: string, `ref`: string) =
|
proc createDispatch*(workflowFileName: string, `ref`: string) =
|
||||||
## https://docs.github.com/en/rest/actions/workflows?apiVersion=2022-11-28#create-a-workflow-dispatch-event
|
## https://docs.github.com/en/rest/actions/workflows?apiVersion=2022-11-28#create-a-workflow-dispatch-event
|
||||||
|
@ -175,7 +174,7 @@ proc fetch(r: GitRepo) =
|
||||||
checkGit code
|
checkGit code
|
||||||
|
|
||||||
proc status(r: GitRepo) =
|
proc status(r: GitRepo) =
|
||||||
let (output, _, code) = runCmdCapt r.git("status", "--porcelain")
|
let (output, _, code) = runCmdCapt(r.git("status", "--porcelain"))
|
||||||
checkGit code
|
checkGit code
|
||||||
if output.len > 0:
|
if output.len > 0:
|
||||||
info "unstaged commits, cowardly exiting..."
|
info "unstaged commits, cowardly exiting..."
|
||||||
|
@ -189,4 +188,6 @@ proc rebase(r: GitRepo, `ref`: string) =
|
||||||
proc updateRepo*() =
|
proc updateRepo*() =
|
||||||
let repo = GitRepo(path: getFlake())
|
let repo = GitRepo(path: getFlake())
|
||||||
fetch repo
|
fetch repo
|
||||||
rebase(repo, "origin/flake-lock")
|
rebase repo, "origin/flake-lock"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,8 @@ import std/macros
|
||||||
|
|
||||||
type
|
type
|
||||||
OverlayKind = enum
|
OverlayKind = enum
|
||||||
oPre, oPost
|
oPre
|
||||||
|
oPost
|
||||||
OverlayProc = object
|
OverlayProc = object
|
||||||
node: NimNode
|
node: NimNode
|
||||||
kind: OverlayKind
|
kind: OverlayKind
|
||||||
|
@ -26,7 +27,6 @@ proc applyOverlay(child: NimNode, overlayProc: OverlayProc) =
|
||||||
macro overlay*(x: untyped): untyped =
|
macro overlay*(x: untyped): untyped =
|
||||||
##[
|
##[
|
||||||
apply pre and post operations to procs:
|
apply pre and post operations to procs:
|
||||||
|
|
||||||
```nim
|
```nim
|
||||||
overlay:
|
overlay:
|
||||||
proc pre(a: bool) =
|
proc pre(a: bool) =
|
||||||
|
@ -43,8 +43,7 @@ macro overlay*(x: untyped): untyped =
|
||||||
echo "inside mine"
|
echo "inside mine"
|
||||||
echo "after"
|
echo "after"
|
||||||
```
|
```
|
||||||
]##
|
]##
|
||||||
|
|
||||||
result = newStmtList()
|
result = newStmtList()
|
||||||
var overlays: seq[OverlayProc]
|
var overlays: seq[OverlayProc]
|
||||||
for child in x.children():
|
for child in x.children():
|
||||||
|
|
Loading…
Reference in a new issue