mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-22 06:00:45 -06:00
Compare commits
8 commits
dea2d9e473
...
9b914e360f
Author | SHA1 | Date | |
---|---|---|---|
9b914e360f | |||
8c1b6e7d31 | |||
5184b724d3 | |||
7475ee3d0f | |||
3f236615ff | |||
5e29472b29 | |||
70eb5db75a | |||
79e8348c84 |
9 changed files with 77 additions and 53 deletions
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
@ -41,7 +41,7 @@ jobs:
|
||||||
- uses: ./.github/actions/nix
|
- uses: ./.github/actions/nix
|
||||||
with:
|
with:
|
||||||
attic_token: ${{ secrets.ATTIC_TOKEN }}
|
attic_token: ${{ secrets.ATTIC_TOKEN }}
|
||||||
clean: true
|
# clean: true
|
||||||
btrfs: true
|
btrfs: true
|
||||||
|
|
||||||
- name: write lock file
|
- name: write lock file
|
||||||
|
|
17
.github/workflows/update.yml
vendored
17
.github/workflows/update.yml
vendored
|
@ -2,10 +2,20 @@ name: Flake Update / Build
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
hosts:
|
||||||
|
description: 'list of hosts to build'
|
||||||
|
required: true
|
||||||
|
default: 'othalan,algiz'
|
||||||
|
type: string
|
||||||
|
|
||||||
schedule:
|
schedule:
|
||||||
# At minute 00:00 on Monday, Wednesday, and Friday.
|
# At minute 00:00 on Monday, Wednesday, and Friday.
|
||||||
- cron: 0 0 * * 1,3,5
|
- cron: 0 0 * * 1,3,5
|
||||||
|
|
||||||
|
env:
|
||||||
|
hosts: ${{ github.event_name == 'schedule' && 'othalan,algiz' || github.event.inputs.hosts }}
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
|
@ -51,7 +61,7 @@ jobs:
|
||||||
nix run .
|
nix run .
|
||||||
--
|
--
|
||||||
cache
|
cache
|
||||||
--host,=",othalan,algiz,mannaz,naudiz"
|
--host,="${{ env.hosts }}"
|
||||||
--flake .
|
--flake .
|
||||||
--debug
|
--debug
|
||||||
--
|
--
|
||||||
|
@ -94,7 +104,7 @@ jobs:
|
||||||
nix run .
|
nix run .
|
||||||
--
|
--
|
||||||
ci update
|
ci update
|
||||||
--host,=othalan,algiz,mannaz,naudiz
|
--host,="${{ env.hosts }}"
|
||||||
--flake .
|
--flake .
|
||||||
--debug
|
--debug
|
||||||
--
|
--
|
||||||
|
@ -102,7 +112,8 @@ jobs:
|
||||||
|
|
||||||
- run: |
|
- run: |
|
||||||
echo "# system diffs" >> $GITHUB_STEP_SUMMARY
|
echo "# system diffs" >> $GITHUB_STEP_SUMMARY
|
||||||
for host in othalan algiz mannaz naudiz; do
|
hosts="${{ env.hosts }}"
|
||||||
|
for host in ${hosts//,/ }; do
|
||||||
echo "## $host" >> $GITHUB_STEP_SUMMARY
|
echo "## $host" >> $GITHUB_STEP_SUMMARY
|
||||||
nix run "nixpkgs#nvd" -- --color always diff ./$host-current ./$host-updated >> $host-summary.md
|
nix run "nixpkgs#nvd" -- --color always diff ./$host-current ./$host-updated >> $host-summary.md
|
||||||
printf '```\n%s\n```\n' "$(nix run "nixpkgs#nvd" -- diff ./$host-current ./$host-updated)" >> $GITHUB_STEP_SUMMARY
|
printf '```\n%s\n```\n' "$(nix run "nixpkgs#nvd" -- diff ./$host-current ./$host-updated)" >> $GITHUB_STEP_SUMMARY
|
||||||
|
|
77
flake.lock
77
flake.lock
|
@ -20,11 +20,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731774881,
|
"lastModified": 1730968822,
|
||||||
"narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=",
|
"narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "aquamarine",
|
"repo": "aquamarine",
|
||||||
"rev": "b31a6a4da8199ae3489057db7d36069a70749a56",
|
"rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -165,11 +165,11 @@
|
||||||
"systems": "systems_3"
|
"systems": "systems_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726560853,
|
"lastModified": 1731533236,
|
||||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -240,11 +240,11 @@
|
||||||
"zig": "zig"
|
"zig": "zig"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731947012,
|
"lastModified": 1732039947,
|
||||||
"narHash": "sha256-OL7pQ/dMLC1Ek+rkXHEXpvx+UBO1Pbo1kTVe2kmcYsY=",
|
"narHash": "sha256-LgLGpeyimlCyHWzsQZ5xL0GJv+14zTVsAPTOuwL/qkA=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "e54ae31d1cf1816f5b9fb7e1fb77d6537dabace6",
|
"rev": "14f603e691e13cb14855a4af8e9760a578f7aefd",
|
||||||
"revCount": 8018,
|
"revCount": 8023,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@github.com/ghostty-org/ghostty"
|
"url": "ssh://git@github.com/ghostty-org/ghostty"
|
||||||
},
|
},
|
||||||
|
@ -318,16 +318,17 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731945258,
|
"lastModified": 1731162467,
|
||||||
"narHash": "sha256-N7uJSSMqHzwH4uahb+Uw3sADVp3XdLfqkP2T144gnFk=",
|
"narHash": "sha256-//Ib7gXCA8jq8c+QGTTIO0oH0rUYYBXGp8sqpI1jlhA=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/tags/v0.45.0",
|
||||||
"rev": "df9ff4489973afa9e29bb94ac47c946db745b460",
|
"rev": "a425fbebe4cf4238e48a42f724ef2208959d66cf",
|
||||||
"revCount": 5475,
|
"revCount": 5433,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland/"
|
"url": "https://github.com/hyprwm/Hyprland/"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
"ref": "refs/tags/v0.45.0",
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland/"
|
"url": "https://github.com/hyprwm/Hyprland/"
|
||||||
|
@ -438,11 +439,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731702627,
|
"lastModified": 1730968903,
|
||||||
"narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=",
|
"narHash": "sha256-zFvzLXcSm0Ia4XI1SE4FQ9KE63hlGrRWhLtwMolWuR8=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprutils",
|
"repo": "hyprutils",
|
||||||
"rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1",
|
"rev": "3ce0cde8709cdacbfba471f8e828433b58a561e9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -498,11 +499,11 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731683711,
|
"lastModified": 1731992627,
|
||||||
"narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=",
|
"narHash": "sha256-OjrXEVD8LtZB5X7LtPCdNx4n5iZOQ2nJmpDlM/foEkI=",
|
||||||
"rev": "c859d03013712b349d82ee6223948d6d03e63a8d",
|
"rev": "f116608a20430b8484814300cdf22eebeb75a59f",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c859d03013712b349d82ee6223948d6d03e63a8d.tar.gz?rev=c859d03013712b349d82ee6223948d6d03e63a8d"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f116608a20430b8484814300cdf22eebeb75a59f.tar.gz?rev=f116608a20430b8484814300cdf22eebeb75a59f"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -521,11 +522,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731185731,
|
"lastModified": 1731967274,
|
||||||
"narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
|
"narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=",
|
||||||
"rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
|
"rev": "aa2846680fa9a2032939d720487942567fd9eb63",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -692,11 +693,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731676054,
|
"lastModified": 1730785428,
|
||||||
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
|
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
|
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -745,11 +746,11 @@
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731954473,
|
"lastModified": 1732040857,
|
||||||
"narHash": "sha256-iNzMvn3P/3tinhRpYQVSVukrFP22qqlQ59a9kKYN7LU=",
|
"narHash": "sha256-nwbtI77CGa6AclGOmNXKLZFboxeAJWqX0IVgT2Ezo1Y=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "8cfa4547f95836136691e10493f18155694f198a",
|
"rev": "1e388cad31a52c4dc25613484b3591298b105935",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -901,11 +902,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731363552,
|
"lastModified": 1730814269,
|
||||||
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
|
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
|
"rev": "d70155fdc00df4628446352fc58adc640cd705c2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1121,11 +1122,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731703417,
|
"lastModified": 1730743262,
|
||||||
"narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=",
|
"narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "8070f36deec723de71e7557441acb17e478204d3",
|
"rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
|
hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1&ref=refs/tags/v0.45.0";
|
||||||
hyprland-contrib.url = "github:hyprwm/contrib";
|
hyprland-contrib.url = "github:hyprwm/contrib";
|
||||||
|
|
||||||
f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
|
f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
|
||||||
|
|
|
@ -8,7 +8,7 @@ buildNimblePackage {
|
||||||
verions = "unstable";
|
verions = "unstable";
|
||||||
src = lib.cleanSource ./.;
|
src = lib.cleanSource ./.;
|
||||||
nativeBuildInputs = [ openssl ];
|
nativeBuildInputs = [ openssl ];
|
||||||
nimbleDepsHash = "sha256-1YoGvWvoJJSMauDbeH8ZHuK+QQot48Mkye9TeWteT8k=";
|
nimbleDepsHash = "sha256-IWdlWC+j2h15WjVXXdDyxDZsb0/Ti1+jy6RfmqHFkjs=";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "nix begat oizys";
|
description = "nix begat oizys";
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
"packages": {
|
"packages": {
|
||||||
"hwylterm": {
|
"hwylterm": {
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"vcsRevision": "c5f70cec4e40ba396f59162e98c359a1a1ea4fe1",
|
"vcsRevision": "ef573dc0f8bf39f80704f92cfab39e1b9af82492",
|
||||||
"url": "https://github.com/daylinmorgan/hwylterm",
|
"url": "https://github.com/daylinmorgan/hwylterm",
|
||||||
"downloadMethod": "git",
|
"downloadMethod": "git",
|
||||||
"dependencies": [],
|
"dependencies": [],
|
||||||
"checksums": {
|
"checksums": {
|
||||||
"sha1": "5727969a8e82e29a7581c13cc7cc45996dbca5a1"
|
"sha1": "ccb51201898b5e913ffee1e18bdf4d9fc4004386"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"jsony": {
|
"jsony": {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
## nix begat oizys
|
## nix begat oizys
|
||||||
import std/[os, osproc, sequtils, strformat, strutils]
|
import std/[os, osproc, sequtils, strformat, strutils, tables]
|
||||||
import hwylterm, hwylterm/[hwylcli]
|
import hwylterm, hwylterm/[hwylcli]
|
||||||
import oizys/[context, github, nix, logging]
|
import oizys/[context, github, nix, logging]
|
||||||
|
|
||||||
|
@ -77,17 +77,27 @@ hwylCli:
|
||||||
ciUpdate(args)
|
ciUpdate(args)
|
||||||
|
|
||||||
[gha]
|
[gha]
|
||||||
... "trigger GHA"
|
... """
|
||||||
|
trigger GHA
|
||||||
|
|
||||||
|
examples:
|
||||||
|
[b]oizys gha update[/] --inputs:hosts:othalan,algiz,mannaz
|
||||||
|
"""
|
||||||
flags:
|
flags:
|
||||||
# make a key/value input that is passed to workflows and encoded in json
|
inputs:
|
||||||
# i.e. --input:ref:main
|
T seq[KVString]
|
||||||
|
? "inputs for dispatch"
|
||||||
`ref`:
|
`ref`:
|
||||||
T string
|
T string
|
||||||
? "git ref/branch/tag to trigger workflow on"
|
? "git ref/branch/tag to trigger workflow on"
|
||||||
* "main"
|
* "main"
|
||||||
run:
|
run:
|
||||||
|
# TODO: support file operations like gh
|
||||||
|
# i.e. @flake.lock means read a file a flake.lock and use it's contents
|
||||||
if args.len == 0: fatalQuit "expected workflow file name"
|
if args.len == 0: fatalQuit "expected workflow file name"
|
||||||
createDispatch(args[0], `ref`)
|
let inputs =
|
||||||
|
inputs.mapIt((it.key, it.val)).toTable()
|
||||||
|
createDispatch(args[0], `ref`, inputs)
|
||||||
|
|
||||||
[dry]
|
[dry]
|
||||||
... "dry run build"
|
... "dry run build"
|
||||||
|
|
|
@ -100,13 +100,14 @@ proc getInProgressRun(
|
||||||
|
|
||||||
warn "timeout reached waiting for workflow to start"
|
warn "timeout reached waiting for workflow to start"
|
||||||
|
|
||||||
proc createDispatch*(workflowFileName: string, `ref`: string) =
|
proc createDispatch*(workflowFileName: string, `ref`: string, inputs: Table[string, 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
|
||||||
let workflow =
|
let workflow =
|
||||||
if workflowFileName.endsWith(".yml") or workflowFileName.endsWith(".yaml"): workflowFileName
|
if workflowFileName.endsWith(".yml") or workflowFileName.endsWith(".yaml"): workflowFileName
|
||||||
else: workflowFileName & ".yml"
|
else: workflowFileName & ".yml"
|
||||||
let body = %*{"ref": `ref`}
|
let body = %*{"ref": `ref`, "inputs": inputs}
|
||||||
info fmt"creating dispatch event for {workflow}"
|
info fmt"creating dispatch event for {workflow}"
|
||||||
|
debug "with body: " & $body
|
||||||
postGhApi(
|
postGhApi(
|
||||||
fmt"https://api.github.com/repos/daylinmorgan/oizys/actions/workflows/{workflow}/dispatches",
|
fmt"https://api.github.com/repos/daylinmorgan/oizys/actions/workflows/{workflow}/dispatches",
|
||||||
body
|
body
|
||||||
|
|
1
todo.md
1
todo.md
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
## software
|
## software
|
||||||
|
|
||||||
|
- [ ] hyprland > v0.45.0 is causing chrome to not tile by default
|
||||||
- [ ] why is my update ci always building llm and rofi?
|
- [ ] why is my update ci always building llm and rofi?
|
||||||
- [ ] include langservers for enabled languages?
|
- [ ] include langservers for enabled languages?
|
||||||
<!--[tracking issue](https://github.com/wez/wezterm/issues/5990)-->
|
<!--[tracking issue](https://github.com/wez/wezterm/issues/5990)-->
|
||||||
|
|
Loading…
Reference in a new issue