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

Compare commits

base: daylin:f3eb0a78aaf6bc9c63f27f01581ae72078a48e00
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:fb848dfa1be56977436cd838006e8bada5f0a224
Branches Tags
daylin:flake-lock
daylin:main

5 commits
f3eb0a78aa ... fb848dfa1b

Author SHA1 Message Date
daylin-bot
fb848dfa1b flake.lock: Update 
Flake lock file updates:

• Updated input 'ghostty':
    'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=7517d0a86b4008fe7d1a05b675cf1f93152e8b71' (2024-11-07)
  → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=70b984ebaff9fb9e80e0332a00eaac7b45b52e1d' (2024-11-11)
• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=e58e97b0a38b8ccc87a4304c9e4e2b37c9966875' (2024-11-07)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=f5fa84554ffe55e29a397014964238be89ffa54d' (2024-11-11)
• Updated input 'hyprland/hyprutils':
    'github:hyprwm/hyprutils/3ce0cde8709cdacbfba471f8e828433b58a561e9' (2024-11-07)
  → 'github:hyprwm/hyprutils/60d3dece30f98e8ad85131829c8529950630d6bc' (2024-11-09)
• Updated input 'hyprman':
    'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=8a866a8082a8debb356b257df1af6ce3becbd1a6' (2024-10-30)
  → 'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=a41acd54a3f887f4050c518de25963d5e7d6208f' (2024-11-07)
• Updated input 'lix':
    '72cce7be3f.tar.gz?narHash=sha256-UAh8hocN7Vdl%2BsXxuToL6Cm1TsMHBpcEmHy%2Bl5xFrMk%3D&rev=72cce7be3f8031ccf6dc9d3c69ba19068b3bd21f' (2024-11-07)
  → '8a9094303b.tar.gz?narHash=sha256-GoddkPg0/UDv06KcQJiOYP/2IzruYorbI03QRCjN3K8%3D&rev=8a9094303bc7873c979e54ea20b9f50464ee3965' (2024-11-11)
• Updated input 'lix-module':
    'fd186f535a.tar.gz?narHash=sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s%3D&rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d' (2024-10-01)
  → '691193879d.tar.gz?narHash=sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA%3D&rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34' (2024-11-09)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/cc2ddbf2df8ef7cc933543b1b42b845ee4772318' (2024-11-03)
  → 'github:nix-community/nix-index-database/896019f04b22ce5db4c0ee4f89978694f44345c3' (2024-11-10)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7' (2024-11-05)
  → 'github:nixos/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2' (2024-11-09)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/ddfa3b485c17ad2594c44c4785533ea45db4e32a' (2024-11-07)
  → 'github:nix-community/nixpkgs-wayland/e71b4345d9aebca98d9ea91eb5f86d57f804f6d6' (2024-11-11)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/d0ecc1890f77e9e170f2de279d6902d84a0cbc51' (2024-11-03)
  → 'github:nix-community/lib-aggregate/807ab623e6d01e931269a28a07c59dcfd6474173' (2024-11-10)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/2376a861a1a15f05339245fbaa4422f2d1bdf485' (2024-11-03)
  → 'github:nix-community/nixpkgs.lib/e04234d263750db01c78a412690363dc2226e68a' (2024-11-10)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/7f9159a16584ee86eed077c8a73e845690b7d513' (2024-10-31)
  → 'github:nix-community/nix-eval-jobs/96902c4573cd03ea7e533634cb49861148f49a7a' (2024-11-10)
• Updated input 'nixpkgs-wayland/nix-eval-jobs/nixpkgs':
    'github:NixOS/nixpkgs/154bcb95ad51bc257c2ce4043a725de6ca700ef6' (2024-08-09)
  → 'github:NixOS/nixpkgs/85f7e662eda4fa3a995556527c87b2524b691933' (2024-11-07)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7' (2024-11-05)
  → 'github:nixos/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2' (2024-11-09)
 2024-11-11 21:07:00 +00:00
Daylin Morgan
02e668f2b2
update hwylcli yet again 2024-11-11 15:02:15 -06:00
Daylin Morgan
b634a2fca6
fix short flags 2024-11-11 12:28:52 -06:00
Daylin Morgan
3d663c381b
add bin to gitignore 2024-11-11 11:01:04 -06:00
Daylin Morgan
7869e1374d
remove unneeded build task 2024-11-11 11:00:42 -06:00
7 changed files with 38 additions and 37 deletions
Show stats Expand all files Collapse all files

30
flake.lock
View file

@ -240,11 +240,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1731182230, "lastModified": 1731351056,
"narHash": "sha256-fFMFH0n+4r9NL/AobvFwSs+PA+F5yiOiImkfi3RJF2k=", "narHash": "sha256-a779DeG+HXRR5Gy/pU47KI/1xeLdeYoA8gyopRRseW4=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "72659d48ac0e27d815fb8b0b96eb8aa2614a4dd9", "rev": "70b984ebaff9fb9e80e0332a00eaac7b45b52e1d",
"revCount": 7940, "revCount": 7942,
"type": "git", "type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty" "url": "ssh://git@github.com/ghostty-org/ghostty"
}, },
@ -318,11 +318,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1731279191, "lastModified": 1731340175,
"narHash": "sha256-9gJ3G8j9yUmzZdluh3fZoSN4qj/Y4XZgl2hsa8sdCwg=", "narHash": "sha256-IfE7lqNFfFyzAu3pe2XTeNovU9tVzJeGLzQ2B8Segy0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "c10739e6e35c30ef5f273bfe5d219d361a31e226", "rev": "f5fa84554ffe55e29a397014964238be89ffa54d",
"revCount": 5438, "revCount": 5448,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -498,11 +498,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731235488, "lastModified": 1731334117,
"narHash": "sha256-RMv1RqyGy88LnKx3XWqVuKlTxdZW6oB4K72LdndM2ZM=", "narHash": "sha256-GoddkPg0/UDv06KcQJiOYP/2IzruYorbI03QRCjN3K8=",
"rev": "d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771", "rev": "8a9094303bc7873c979e54ea20b9f50464ee3965",
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@ -745,11 +745,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1731277985, "lastModified": 1731353483,
"narHash": "sha256-s6hkbXZSSlIxsP7RwmPt/OTfgkmMC+HDQaZcjGaiVog=", "narHash": "sha256-0IZPqgc4k/VqP3yLhNw8QbiPRq56Cl07ewRv7aqQZIw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "7722c64bdf19304754fbcf05722348e340514ccd", "rev": "e71b4345d9aebca98d9ea91eb5f86d57f804f6d6",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
pkgs/oizys/.gitignore vendored
View file

@ -1,5 +1,5 @@
nimbledeps nimbledeps
nimble.paths nimble.paths
nimble.develop nimble.develop
bin/
oizys.out oizys.out

3
pkgs/oizys/config.nims
View file

@ -1,6 +1,3 @@
task build, "build oizys":
selfExec "c -o:oizys src/oizys.nim"
# begin Nimble config (version 2) # begin Nimble config (version 2)
--noNimblePath --noNimblePath
when withDir(thisDir(), system.fileExists("nimble.paths")): when withDir(thisDir(), system.fileExists("nimble.paths")):

2
pkgs/oizys/default.nix
View file

@ -8,7 +8,7 @@ buildNimblePackage {
verions = "unstable"; verions = "unstable";
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
nativeBuildInputs = [ openssl ]; nativeBuildInputs = [ openssl ];
nimbleDepsHash = "sha256-/H/HvnJqpDJcyVJ2rbn7PDSSoJB/TMr9yiIKxtB1O+E="; nimbleDepsHash = "sha256-ZEPzosRwokkvPKbv5nqzATv6IqUhqM2prOU0vUUC80Q=";
meta = { meta = {
description = "nix begat oizys"; description = "nix begat oizys";

4
pkgs/oizys/nimble.lock
View file

@ -3,12 +3,12 @@
"packages": { "packages": {
"hwylterm": { "hwylterm": {
"version": "0.1.0", "version": "0.1.0",
"vcsRevision": "e8e090c5b76bc555231bda536193df6f92a54db2", "vcsRevision": "65a952e9f0d75659d39f8a3b146753e291ee0a66",
"url": "https://github.com/daylinmorgan/hwylterm", "url": "https://github.com/daylinmorgan/hwylterm",
"downloadMethod": "git", "downloadMethod": "git",
"dependencies": [], "dependencies": [],
"checksums": { "checksums": {
"sha1": "925aad3ce660979de7cdb2f58a31dc7ac693e34d" "sha1": "10894d492bbe1d0ea32ee9bb0686abfcd3b0b0fe"
} }
}, },
"jsony": { "jsony": {

2
pkgs/oizys/oizys.nimble
View file

@ -13,5 +13,5 @@ bin = @["oizys"]
requires "nim >= 2.0.8" requires "nim >= 2.0.8"
requires "jsony" requires "jsony"
requires "zippy" requires "zippy"
requires "https://github.com/daylinmorgan/hwylterm#e8e090c" requires "https://github.com/daylinmorgan/hwylterm#65a952e"

32
pkgs/oizys/src/oizys.nim
View file

@ -1,6 +1,6 @@
## nix begat oizys ## nix begat oizys
import std/[os, osproc, sequtils, strformat, strutils] import std/[os, osproc, sequtils, strformat, strutils]
import hwylterm, hwylterm/[hwylcli, logging] import hwylterm, hwylterm/[hwylcli]
import oizys/[context, github, nix, logging] import oizys/[context, github, nix, logging]
proc checkExes() = proc checkExes() =
@ -13,47 +13,49 @@ hwylCli:
name "oizys" name "oizys"
flags: flags:
[global] [global]
flake "path/to/flake" flake:
T string
? "path/to/flake"
host: host:
T seq[string] T seq[string]
? "host(s) to build" ? "host(s) to build"
debug: debug:
T bool
? "enable debug mode" ? "enable debug mode"
- d - d
resetCache: resetCache:
T bool
? "set cache timeout to 0" ? "set cache timeout to 0"
- r - r
[yes] [yes]
yes: yes:
T bool - y
? "skip all confirmation prompts" ? "skip all confirmation prompts"
[minimal] [minimal]
minimal: minimal:
T bool
? "set minimal" ? "set minimal"
- m - m
preSub: preSub:
setupLoggers(debug) setupLoggers(debug)
updateContext(host, flake, debug, resetCache) updateContext(host, flake, debug, resetCache)
subcommands: subcommands:
--- build [build]
... "nix build" ... "nix build"
flags: flags:
^[minimal] ^[minimal]
run: run:
nixBuild(minimal, args) nixBuild(minimal, args)
--- cache [cache]
... "build and push store paths" ... "build and push store paths"
flags: flags:
name: name:
T string
? "name of binary cache" ? "name of binary cache"
* "oizys" * "oizys"
service: service:
T string
? "name of cache service" ? "name of cache service"
* "attic" * "attic"
jobs: jobs:
@ -64,24 +66,25 @@ hwylCli:
run: run:
nixBuildWithCache(name, args, service, jobs) nixBuildWithCache(name, args, service, jobs)
--- ci [ci]
... "trigger GHA" ... "trigger GHA"
flags: flags:
`ref`: `ref`:
T string
? "git ref/branch/tag to trigger workflow on" ? "git ref/branch/tag to trigger workflow on"
* "main" * "main"
run: run:
if args.len == 0: fatalQuit "expected workflow file name" if args.len == 0: fatalQuit "expected workflow file name"
createDispatch(args[0], `ref`) createDispatch(args[0], `ref`)
--- dry [dry]
... "dry run build" ... "dry run build"
flags: flags:
^[minimal] ^[minimal]
run: run:
nixBuildHostDry(minimal, args) nixBuildHostDry(minimal, args)
--- os [os]
? "[b]oizys os[/] [i]subcmd[/] [[[faint]flags[/]]" ? "[b]oizys os[/] [i]subcmd[/] [[[faint]flags[/]]"
... "nixos-rebuild [italic]subcmd[/]" ... "nixos-rebuild [italic]subcmd[/]"
run: run:
@ -94,16 +97,17 @@ hwylCli:
) )
nixosRebuild(subcmd, args[1..^1]) nixosRebuild(subcmd, args[1..^1])
--- output [output]
... "nixos config attr" ... "nixos config attr"
run: run:
echo nixosConfigAttrs().join(" ") echo nixosConfigAttrs().join(" ")
--- update [update]
... "update and run nixos-rebuild" ... "update and run nixos-rebuild"
flags: flags:
^[yes] ^[yes]
preview: preview:
- p
T bool T bool
? "show preview and exit" ? "show preview and exit"
run: run:
@ -116,4 +120,4 @@ hwylCli:
if yes or confirm("Proceed with system update?"): if yes or confirm("Proceed with system update?"):
updateRepo() updateRepo()
nixosRebuild("switch") nixosRebuild("switch")