flake.lock: Update

Flake lock file updates: • Updated input 'ghostty': 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=e54ae31d1cf1816f5b9fb7e1fb77d6537dabace6' (2024-11-18) → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=14f603e691e13cb14855a4af8e9760a578f7aefd' (2024-11-19) • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=df9ff4489973afa9e29bb94ac47c946db745b460' (2024-11-18) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=c4eda46d0ef022a17348623beec4154ba34af691' (2024-11-19) • Updated input 'lix': 'c859d03013.tar.gz?narHash=sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE%3D&rev=c859d03013712b349d82ee6223948d6d03e63a8d' (2024-11-15) → 'b0d7a81613.tar.gz?narHash=sha256-3ubtSu0D%2BBUV5FKmBU7kTEXlI/okp/j1xC/ODC7LgTA%3D&rev=b0d7a816135de1cd551b8a54f5497148bf59d81d' (2024-11-19) • Updated input 'lix-module': '691193879d.tar.gz?narHash=sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA%3D&rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34' (2024-11-09) → 'aa2846680f.tar.gz?narHash=sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0%3D&rev=aa2846680fa9a2032939d720487942567fd9eb63' (2024-11-18) • Updated input 'lix-module/flake-utils': 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/8cfa4547f95836136691e10493f18155694f198a' (2024-11-18) → 'github:nix-community/nixpkgs-wayland/1e388cad31a52c4dc25613484b3591298b105935' (2024-11-19)
support key-val hosts
2024-12-21 21:50:43 -06:00 · 2024-11-20 05:02:32 +00:00 · 2024-11-19 14:59:52 -06:00 · 2024-11-19 14:32:19 -06:00
7 changed files with 55 additions and 36 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -41,7 +41,7 @@ jobs:
      - uses: ./.github/actions/nix
        with:
          attic_token: ${{ secrets.ATTIC_TOKEN }}
-          clean: true
+          # clean: true
          btrfs: true

      - name: write lock file
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@ -2,6 +2,13 @@ name: Flake Update / Build

 on:
  workflow_dispatch:
+    inputs:
+      hosts:
+        description: 'list of hosts to build'
+        required: true
+        default: 'othalan,algiz'
+        type: string
+ 
  schedule:
    # At minute 00:00 on Monday, Wednesday, and Friday.
    - cron: 0 0 * * 1,3,5
@ -51,7 +58,7 @@ jobs:
          nix run .
          --
          cache
-          --host,=",othalan,algiz,mannaz,naudiz"
+          --host,="${{ inputs.hosts }}"
          --flake .
          --debug
          --
@ -94,7 +101,7 @@ jobs:
          nix run .
          --
          ci update
-          --host,=othalan,algiz,mannaz,naudiz
+          --host,="${{ inputs.hosts }}"
          --flake .
          --debug
          --
@ -102,7 +109,8 @@ jobs:

      - run: |
          echo "# system diffs" >> $GITHUB_STEP_SUMMARY
-          for host in othalan algiz mannaz naudiz; do
+          hosts="${{ inputs.hosts }}"
+          for host in ${hosts//,/ }; do
            echo "## $host" >> $GITHUB_STEP_SUMMARY
            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
--- a/flake.lock
+++ b/flake.lock
@ -165,11 +165,11 @@
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@ -240,11 +240,11 @@
        "zig": "zig"
      },
      "locked": {
-        "lastModified": 1731947012,
-        "narHash": "sha256-OL7pQ/dMLC1Ek+rkXHEXpvx+UBO1Pbo1kTVe2kmcYsY=",
+        "lastModified": 1732039947,
+        "narHash": "sha256-LgLGpeyimlCyHWzsQZ5xL0GJv+14zTVsAPTOuwL/qkA=",
        "ref": "refs/heads/main",
-        "rev": "e54ae31d1cf1816f5b9fb7e1fb77d6537dabace6",
-        "revCount": 8018,
+        "rev": "14f603e691e13cb14855a4af8e9760a578f7aefd",
+        "revCount": 8023,
        "type": "git",
        "url": "ssh://git@github.com/ghostty-org/ghostty"
      },
@ -318,11 +318,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1731945258,
-        "narHash": "sha256-N7uJSSMqHzwH4uahb+Uw3sADVp3XdLfqkP2T144gnFk=",
+        "lastModified": 1732054045,
+        "narHash": "sha256-/2SKmO6AWDqvhN8A8VxA244Au3LwFu7wOXzudWQXr9s=",
        "ref": "refs/heads/main",
-        "rev": "df9ff4489973afa9e29bb94ac47c946db745b460",
-        "revCount": 5475,
+        "rev": "c4eda46d0ef022a17348623beec4154ba34af691",
+        "revCount": 5482,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland/"
@ -498,11 +498,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1731683711,
-        "narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=",
-        "rev": "c859d03013712b349d82ee6223948d6d03e63a8d",
+        "lastModified": 1732056932,
+        "narHash": "sha256-3ubtSu0D+BUV5FKmBU7kTEXlI/okp/j1xC/ODC7LgTA=",
+        "rev": "b0d7a816135de1cd551b8a54f5497148bf59d81d",
        "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/b0d7a816135de1cd551b8a54f5497148bf59d81d.tar.gz?rev=b0d7a816135de1cd551b8a54f5497148bf59d81d"
      },
      "original": {
        "type": "tarball",
@ -521,11 +521,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1731185731,
-        "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
-        "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
+        "lastModified": 1731967274,
+        "narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=",
+        "rev": "aa2846680fa9a2032939d720487942567fd9eb63",
        "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": {
        "type": "tarball",
@ -745,11 +745,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1731954473,
-        "narHash": "sha256-iNzMvn3P/3tinhRpYQVSVukrFP22qqlQ59a9kKYN7LU=",
+        "lastModified": 1732040857,
+        "narHash": "sha256-nwbtI77CGa6AclGOmNXKLZFboxeAJWqX0IVgT2Ezo1Y=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "8cfa4547f95836136691e10493f18155694f198a",
+        "rev": "1e388cad31a52c4dc25613484b3591298b105935",
        "type": "github"
      },
      "original": {
--- a/pkgs/oizys/default.nix
+++ b/pkgs/oizys/default.nix
@ -8,7 +8,7 @@ buildNimblePackage {
  verions = "unstable";
  src = lib.cleanSource ./.;
  nativeBuildInputs = [ openssl ];
-  nimbleDepsHash = "sha256-1YoGvWvoJJSMauDbeH8ZHuK+QQot48Mkye9TeWteT8k=";
+  nimbleDepsHash = "sha256-IWdlWC+j2h15WjVXXdDyxDZsb0/Ti1+jy6RfmqHFkjs=";

  meta = {
    description = "nix begat oizys";
--- a/pkgs/oizys/nimble.lock
+++ b/pkgs/oizys/nimble.lock
@ -3,12 +3,12 @@
  "packages": {
    "hwylterm": {
      "version": "0.1.0",
-      "vcsRevision": "c5f70cec4e40ba396f59162e98c359a1a1ea4fe1",
+      "vcsRevision": "ef573dc0f8bf39f80704f92cfab39e1b9af82492",
      "url": "https://github.com/daylinmorgan/hwylterm",
      "downloadMethod": "git",
      "dependencies": [],
      "checksums": {
-        "sha1": "5727969a8e82e29a7581c13cc7cc45996dbca5a1"
+        "sha1": "ccb51201898b5e913ffee1e18bdf4d9fc4004386"
      }
    },
    "jsony": {
--- a/pkgs/oizys/src/oizys.nim
+++ b/pkgs/oizys/src/oizys.nim
@ -1,5 +1,5 @@
 ## nix begat oizys
-import std/[os, osproc, sequtils, strformat, strutils]
+import std/[os, osproc, sequtils, strformat, strutils, tables]
 import hwylterm, hwylterm/[hwylcli]
 import oizys/[context, github, nix, logging]

@ -77,17 +77,27 @@ hwylCli:
        ciUpdate(args)

    [gha]
-    ... "trigger GHA"
+    ... """
+    trigger GHA
+
+    examples:
+      [b]oizys gha update[/] --input:hosts:othalan,algiz,mannaz
+    """
    flags:
-      # make a key/value input that is passed to workflows and encoded in json
-      # i.e. --input:ref:main
+      input:
+        T seq[KVString]
+        ? "inputs for dispatch"
      `ref`:
        T string
        ? "git ref/branch/tag to trigger workflow on"
        * "main"
    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"
-      createDispatch(args[0], `ref`)
+      let inputs = 
+        input.mapIt((it.key, it.val)).toTable()
+      createDispatch(args[0], `ref`, inputs)

    [dry]
    ... "dry run build"
--- a/pkgs/oizys/src/oizys/github.nim
+++ b/pkgs/oizys/src/oizys/github.nim
@ -100,13 +100,14 @@ proc getInProgressRun(

  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
  let workflow =
    if workflowFileName.endsWith(".yml") or workflowFileName.endsWith(".yaml"): workflowFileName
    else: workflowFileName & ".yml"
-  let body = %*{"ref": `ref`}
+  let body = %*{"ref": `ref`, "inputs": inputs}
  info fmt"creating dispatch event for {workflow}"
+  debug "with body: " & $body
  postGhApi(
   fmt"https://api.github.com/repos/daylinmorgan/oizys/actions/workflows/{workflow}/dispatches",
   body