mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-22 06:00:45 -06:00
Compare commits
5 commits
f3eb0a78aa
...
fb848dfa1b
| Author | SHA1 | Date | |
|---|---|---|---|
| fb848dfa1b | |||
02e668f2b2
|
|||
|
b634a2fca6
|
|||
|
3d663c381b
|
|||
|
7869e1374d
|
7 changed files with 38 additions and 37 deletions
30
flake.lock
30
flake.lock
|
|
@ -240,11 +240,11 @@
|
|||
"zig": "zig"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731182230,
|
||||
"narHash": "sha256-fFMFH0n+4r9NL/AobvFwSs+PA+F5yiOiImkfi3RJF2k=",
|
||||
"lastModified": 1731351056,
|
||||
"narHash": "sha256-a779DeG+HXRR5Gy/pU47KI/1xeLdeYoA8gyopRRseW4=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "72659d48ac0e27d815fb8b0b96eb8aa2614a4dd9",
|
||||
"revCount": 7940,
|
||||
"rev": "70b984ebaff9fb9e80e0332a00eaac7b45b52e1d",
|
||||
"revCount": 7942,
|
||||
"type": "git",
|
||||
"url": "ssh://git@github.com/ghostty-org/ghostty"
|
||||
},
|
||||
|
|
@ -318,11 +318,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731279191,
|
||||
"narHash": "sha256-9gJ3G8j9yUmzZdluh3fZoSN4qj/Y4XZgl2hsa8sdCwg=",
|
||||
"lastModified": 1731340175,
|
||||
"narHash": "sha256-IfE7lqNFfFyzAu3pe2XTeNovU9tVzJeGLzQ2B8Segy0=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "c10739e6e35c30ef5f273bfe5d219d361a31e226",
|
||||
"revCount": 5438,
|
||||
"rev": "f5fa84554ffe55e29a397014964238be89ffa54d",
|
||||
"revCount": 5448,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
|
@ -498,11 +498,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731235488,
|
||||
"narHash": "sha256-RMv1RqyGy88LnKx3XWqVuKlTxdZW6oB4K72LdndM2ZM=",
|
||||
"rev": "d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771",
|
||||
"lastModified": 1731334117,
|
||||
"narHash": "sha256-GoddkPg0/UDv06KcQJiOYP/2IzruYorbI03QRCjN3K8=",
|
||||
"rev": "8a9094303bc7873c979e54ea20b9f50464ee3965",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771.tar.gz?rev=d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8a9094303bc7873c979e54ea20b9f50464ee3965.tar.gz?rev=8a9094303bc7873c979e54ea20b9f50464ee3965"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
|
@ -745,11 +745,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731277985,
|
||||
"narHash": "sha256-s6hkbXZSSlIxsP7RwmPt/OTfgkmMC+HDQaZcjGaiVog=",
|
||||
"lastModified": 1731353483,
|
||||
"narHash": "sha256-0IZPqgc4k/VqP3yLhNw8QbiPRq56Cl07ewRv7aqQZIw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "7722c64bdf19304754fbcf05722348e340514ccd",
|
||||
"rev": "e71b4345d9aebca98d9ea91eb5f86d57f804f6d6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
2
pkgs/oizys/.gitignore
vendored
2
pkgs/oizys/.gitignore
vendored
|
|
@ -1,5 +1,5 @@
|
|||
nimbledeps
|
||||
nimble.paths
|
||||
nimble.develop
|
||||
|
||||
bin/
|
||||
oizys.out
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
task build, "build oizys":
|
||||
selfExec "c -o:oizys src/oizys.nim"
|
||||
|
||||
# begin Nimble config (version 2)
|
||||
--noNimblePath
|
||||
when withDir(thisDir(), system.fileExists("nimble.paths")):
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ buildNimblePackage {
|
|||
verions = "unstable";
|
||||
src = lib.cleanSource ./.;
|
||||
nativeBuildInputs = [ openssl ];
|
||||
nimbleDepsHash = "sha256-/H/HvnJqpDJcyVJ2rbn7PDSSoJB/TMr9yiIKxtB1O+E=";
|
||||
nimbleDepsHash = "sha256-ZEPzosRwokkvPKbv5nqzATv6IqUhqM2prOU0vUUC80Q=";
|
||||
|
||||
meta = {
|
||||
description = "nix begat oizys";
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
"packages": {
|
||||
"hwylterm": {
|
||||
"version": "0.1.0",
|
||||
"vcsRevision": "e8e090c5b76bc555231bda536193df6f92a54db2",
|
||||
"vcsRevision": "65a952e9f0d75659d39f8a3b146753e291ee0a66",
|
||||
"url": "https://github.com/daylinmorgan/hwylterm",
|
||||
"downloadMethod": "git",
|
||||
"dependencies": [],
|
||||
"checksums": {
|
||||
"sha1": "925aad3ce660979de7cdb2f58a31dc7ac693e34d"
|
||||
"sha1": "10894d492bbe1d0ea32ee9bb0686abfcd3b0b0fe"
|
||||
}
|
||||
},
|
||||
"jsony": {
|
||||
|
|
|
|||
|
|
@ -13,5 +13,5 @@ bin = @["oizys"]
|
|||
requires "nim >= 2.0.8"
|
||||
requires "jsony"
|
||||
requires "zippy"
|
||||
requires "https://github.com/daylinmorgan/hwylterm#e8e090c"
|
||||
requires "https://github.com/daylinmorgan/hwylterm#65a952e"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
## nix begat oizys
|
||||
import std/[os, osproc, sequtils, strformat, strutils]
|
||||
import hwylterm, hwylterm/[hwylcli, logging]
|
||||
import hwylterm, hwylterm/[hwylcli]
|
||||
import oizys/[context, github, nix, logging]
|
||||
|
||||
proc checkExes() =
|
||||
|
|
@ -13,47 +13,49 @@ hwylCli:
|
|||
name "oizys"
|
||||
flags:
|
||||
[global]
|
||||
flake "path/to/flake"
|
||||
flake:
|
||||
T string
|
||||
? "path/to/flake"
|
||||
host:
|
||||
T seq[string]
|
||||
? "host(s) to build"
|
||||
debug:
|
||||
T bool
|
||||
? "enable debug mode"
|
||||
- d
|
||||
resetCache:
|
||||
T bool
|
||||
? "set cache timeout to 0"
|
||||
- r
|
||||
[yes]
|
||||
yes:
|
||||
T bool
|
||||
- y
|
||||
? "skip all confirmation prompts"
|
||||
[minimal]
|
||||
minimal:
|
||||
T bool
|
||||
? "set minimal"
|
||||
- m
|
||||
|
||||
preSub:
|
||||
setupLoggers(debug)
|
||||
updateContext(host, flake, debug, resetCache)
|
||||
|
||||
subcommands:
|
||||
|
||||
--- build
|
||||
[build]
|
||||
... "nix build"
|
||||
flags:
|
||||
^[minimal]
|
||||
run:
|
||||
nixBuild(minimal, args)
|
||||
|
||||
--- cache
|
||||
[cache]
|
||||
... "build and push store paths"
|
||||
flags:
|
||||
name:
|
||||
T string
|
||||
? "name of binary cache"
|
||||
* "oizys"
|
||||
service:
|
||||
T string
|
||||
? "name of cache service"
|
||||
* "attic"
|
||||
jobs:
|
||||
|
|
@ -64,24 +66,25 @@ hwylCli:
|
|||
run:
|
||||
nixBuildWithCache(name, args, service, jobs)
|
||||
|
||||
--- ci
|
||||
[ci]
|
||||
... "trigger GHA"
|
||||
flags:
|
||||
`ref`:
|
||||
T string
|
||||
? "git ref/branch/tag to trigger workflow on"
|
||||
* "main"
|
||||
run:
|
||||
if args.len == 0: fatalQuit "expected workflow file name"
|
||||
createDispatch(args[0], `ref`)
|
||||
|
||||
--- dry
|
||||
[dry]
|
||||
... "dry run build"
|
||||
flags:
|
||||
^[minimal]
|
||||
run:
|
||||
nixBuildHostDry(minimal, args)
|
||||
|
||||
--- os
|
||||
[os]
|
||||
? "[b]oizys os[/] [i]subcmd[/] [[[faint]flags[/]]"
|
||||
... "nixos-rebuild [italic]subcmd[/]"
|
||||
run:
|
||||
|
|
@ -94,16 +97,17 @@ hwylCli:
|
|||
)
|
||||
nixosRebuild(subcmd, args[1..^1])
|
||||
|
||||
--- output
|
||||
[output]
|
||||
... "nixos config attr"
|
||||
run:
|
||||
echo nixosConfigAttrs().join(" ")
|
||||
|
||||
--- update
|
||||
[update]
|
||||
... "update and run nixos-rebuild"
|
||||
flags:
|
||||
^[yes]
|
||||
preview:
|
||||
- p
|
||||
T bool
|
||||
? "show preview and exit"
|
||||
run:
|
||||
|
|
@ -116,4 +120,4 @@ hwylCli:
|
|||
if yes or confirm("Proceed with system update?"):
|
||||
updateRepo()
|
||||
nixosRebuild("switch")
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue