daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-09-19 18:47:18 -05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:16ff586de47ae0532354caf2de6a30fb2c627df5
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
..
compare: daylin:6d2146a4f35c9fc09f850b7f03603a31b9e01a5f
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

No commits in common. "16ff586de47ae0532354caf2de6a30fb2c627df5" and "6d2146a4f35c9fc09f850b7f03603a31b9e01a5f" have entirely different histories.
16ff586de4 ... 6d2146a4f3

6 changed files with 66 additions and 62 deletions
Show stats Expand all files Collapse all files

64
flake.lock
View file

@ -20,11 +20,11 @@
]
},
"locked": {
"lastModified": 1725753098,
"narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=",
"lastModified": 1725199881,
"narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52",
"rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b",
"type": "github"
},
"original": {
@ -323,11 +323,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1726071051,
"narHash": "sha256-eZPhLQ8DM8AsP+zM1KmUzxWQaiTpOUbFS1xeOyjgwvg=",
"lastModified": 1725976150,
"narHash": "sha256-Dv4XEWRcVFZhBDbj11/zuuXyf7TGHFVU1IGH9W/yPX8=",
"ref": "refs/heads/main",
"rev": "8b9e385943d1a9fd0f8c6070fa1eae507ae26145",
"revCount": 5213,
"rev": "155d44016d0cb11332c454db73d59030cdbd7b13",
"revCount": 5209,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland/"
@ -399,11 +399,11 @@
]
},
"locked": {
"lastModified": 1725997860,
"narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=",
"lastModified": 1725188252,
"narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876",
"rev": "c12ab785ce1982f82594aff03b3104c598186ddd",
"type": "github"
},
"original": {
@ -504,11 +504,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1726016547,
"narHash": "sha256-tB4Y3Rrv67ZdEo3HJzxYL5XX9wqtvWwIX1z8k399W0s=",
"rev": "24db81eaf28259ab8f8334ccd6368673a26ed422",
"lastModified": 1725927421,
"narHash": "sha256-tiQ9OxiuTb/02xEU2ceo9MIxWBS5Rm/IAhv6QshH8K0=",
"rev": "cc183fdbc14ce105a5661d646983f791978b9d5c",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/24db81eaf28259ab8f8334ccd6368673a26ed422.tar.gz?rev=24db81eaf28259ab8f8334ccd6368673a26ed422"
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/cc183fdbc14ce105a5661d646983f791978b9d5c.tar.gz?rev=cc183fdbc14ce105a5661d646983f791978b9d5c"
},
"original": {
"type": "tarball",
@ -707,11 +707,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1725983898,
"narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github"
},
"original": {
@ -744,11 +744,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1726058240,
"narHash": "sha256-p74soeV48Sry7+wOxDJ8Gqx3JT26lH9AY4+slpJemyw=",
"lastModified": 1725981791,
"narHash": "sha256-+4dwaoIrnubM29MK8BW4S2mdKwdlCF1svtO0hQ443X0=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "5d6271a06b79364aa838cdc68c5852d383b17236",
"rev": "90046312d6c074e7b941b7ea9c4e54f4d416e5da",
"type": "github"
},
"original": {
@ -791,11 +791,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1725983898,
"narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
"lastModified": 1725634671,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
"type": "github"
},
"original": {
@ -823,11 +823,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1725983898,
"narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
"lastModified": 1725634671,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
"type": "github"
},
"original": {
@ -900,11 +900,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1726002278,
"narHash": "sha256-INEUQt5tQkmQtHv+//9+FGFOet2IEJPg/31y8qtsCqs=",
"lastModified": 1725957803,
"narHash": "sha256-qBG8DEmc9aOLr/WBtsuOB5QKEDxK2bDy4dq3X686xdo=",
"owner": "roc-lang",
"repo": "roc",
"rev": "3d9c4673af25349be43e0e8e703a0f4b36176577",
"rev": "2936a37a1c54cb4cb10003c3b7e43a4772bbccf9",
"type": "github"
},
"original": {
@ -1162,11 +1162,11 @@
]
},
"locked": {
"lastModified": 1726046979,
"narHash": "sha256-6SEsjurq9cdTkITA6d49ncAJe4O/8CgRG5/F//s6Xh8=",
"lastModified": 1725228143,
"narHash": "sha256-kbSiPA5oXiz1+1eVoRslMi5wylHD6SDT8dS9eZAxXAM=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "e695669fd8e1d1be9eaae40f35e00f8bd8b64c18",
"rev": "11e15b437e7efc39e452f36e15a183225d6bfa39",
"type": "github"
},
"original": {

10
modules/programs/chrome/default.nix
View file

@ -23,13 +23,11 @@ mkOizysModule config "chrome" {
};
environment.systemPackages = with pkgs; [
# (chromium.override {
# commandLineArgs = [ "--force-dark-mode" ];
# enableWideVine = true;
# })
(google-chrome.override {
(chromium.override {
commandLineArgs = [ "--force-dark-mode" ];
enableWideVine = true;
})
(google-chrome.override { commandLineArgs = [ "--force-dark-mode" ]; })
];
}

19
pkgs/oizys-nim/src/oizys/context.nim
View file

@ -23,19 +23,22 @@ proc initContext*(): OizysContext =
result.ci = getEnv("GITHUB_STEP_SUMMARY") != ""
var oc = initContext()
proc checkPath(s: string): string =
proc checkPath(s: string): string =
## 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
# public api -------------------------------------
proc updateContext*(
host: seq[string],
flake: string,
debug: bool,
resetCache: bool
) =
if host.len > 0: oc.hosts = host
if host.len > 0:
oc.hosts = host
oc.debug = debug
oc.resetCache = resetCache
if flake != "":
@ -46,9 +49,9 @@ proc updateContext*(
debug bb(fmt"""[b]flake[/]: {oc.flake}, [b]hosts[/]: {oc.hosts.join(" ")}""")
proc getHosts*(): seq[string] = return oc.hosts
proc getFlake*(): string = return oc.flake
proc isDebug*(): bool = return oc.debug
proc isResetCache*(): bool = return oc.resetCache
proc isCi*(): bool = return oc.ci
proc getFlake*(): string = return oc.flake
proc isDebug*(): bool = return oc.debug
proc isResetCache*(): bool = return oc.resetCache
proc isCi*(): bool = return oc.ci

11
pkgs/oizys-nim/src/oizys/exec.nim
View file

@ -32,22 +32,25 @@ proc runCmdCapt*(
args = args[1..^1],
options = {poUsePath}
)
# NOTE: if I didn't use streams could I just read from the file handle instead?
let
let
outstrm = peekableOutputStream p
errstrm = peekableErrorStream p
result.exitCode = -1
var line: string
# var cnt: int
while true:
if CaptStdout in capture:
if outstrm.readLine(line):
if outstrm.readLine(line):
result.stdout.add line & '\n'
if CaptStderr in capture:
if errstrm.readLine(line):
result.stderr.add line & '\n'
result.exitCode = peekExitCode(p)
if result.exitCode != -1: break
# result.exitCode = waitForExit p
# result.exitCode = waitForExit p
# close p
close p
proc runCmdCaptWithSpinner*(

17
pkgs/oizys-nim/src/oizys/github.nim
View file

@ -7,19 +7,19 @@ import ./[logging, exec, context]
when defined(amd64) and (defined(gcc) or defined(clang)):
{.passC: "-msse4.1 -mpclmul".}
template withTmpDir(body: untyped): untyped =
template withTmpDir(body: untyped): untyped =
let tmpDir {.inject.} = createTempDir("oizys","")
body
removeDir tmpDir
removeDir(tmpDir)
var ghToken = getEnv "GITHUB_TOKEN"
var ghToken = getEnv("GITHUB_TOKEN")
proc checkToken() {.inline.} =
if ghToken == "": fatalQuit "GITHUB_TOKEN not set"
proc ghClient(
maxRedirects = 5
): HttpClient =
): HttpClient =
checkToken()
result = newHttpClient(maxRedirects = maxRedirects)
result.headers = newHttpHeaders({
@ -50,8 +50,7 @@ proc postGhApi(url: string, body: JsonNode) =
let response = client.post(url, body = $body)
info fmt"Status: {response.code}"
except:
errorQuit "failed to get response code"
error "failed to get response code"
proc createDispatch*(workflowFileName: string, `ref`: string) =
## 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
proc status(r: GitRepo) =
let (output, _, code) = runCmdCapt r.git("status", "--porcelain")
let (output, _, code) = runCmdCapt(r.git("status", "--porcelain"))
checkGit code
if output.len > 0:
info "unstaged commits, cowardly exiting..."
@ -189,4 +188,6 @@ proc rebase(r: GitRepo, `ref`: string) =
proc updateRepo*() =
let repo = GitRepo(path: getFlake())
fetch repo
rebase(repo, "origin/flake-lock")
rebase repo, "origin/flake-lock"

7
pkgs/oizys-nim/src/oizys/overlay.nim
View file

@ -2,7 +2,8 @@ import std/macros
type
OverlayKind = enum
oPre, oPost
oPre
oPost
OverlayProc = object
node: NimNode
kind: OverlayKind
@ -26,7 +27,6 @@ proc applyOverlay(child: NimNode, overlayProc: OverlayProc) =
macro overlay*(x: untyped): untyped =
##[
apply pre and post operations to procs:
```nim
overlay:
proc pre(a: bool) =
@ -43,8 +43,7 @@ macro overlay*(x: untyped): untyped =
echo "inside mine"
echo "after"
```
]##
]##
result = newStmtList()
var overlays: seq[OverlayProc]
for child in x.children():