flake.lock: Update

Flake lock file updates:

• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/cbe4866388730d63d98743cc884062b6374beb41' (2024-09-16)
  → 'github:nix-community/nixpkgs-wayland/6002e05eb85219d1018b3d3f6c8692ac26e2642a' (2024-09-16)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/8802412b8747633e9d80639897e4d58fa6290909' (2024-08-11)
  → 'github:nix-community/nix-eval-jobs/a7cdbbbd9a7755489267dfd1297c613c824a5920' (2024-09-16)
• Updated input 'roc':
    'github:roc-lang/roc/7df11424550bb7955a178190a3b341e34d184a19' (2024-09-15)
  → 'github:roc-lang/roc/38674aeb9415c47b5ea1c397a7c7f8378cd5cbaf' (2024-09-16)
• Updated input 'tsm':
    'github:daylinmorgan/tsm/8c866db5f020cbdbe9ea9123ce4b92478b41ede5?dir=nix' (2024-09-14)
  → 'github:daylinmorgan/tsm/5991d93bcb216c4cd5345296111fee7027be29cf?dir=nix' (2024-09-16)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/ff9255e02181bad3562f5f24fa27a26036a5f112' (2024-09-16)
  → 'github:mitchellh/zig-overlay/42a7e61fa262d2fe3df7c9544938ef0dd2a2a56a' (2024-09-17)
• Updated input 'zls':
    'github:zigtools/zls/956b436a3f302d5dbc7fecfa565da666c1b2df77' (2024-09-15)
  → 'github:zigtools/zls/cf9b49a67b15693d62926ea11d17f53efc60be50' (2024-09-16)

.github/workflows/build.yml

@@ -32,14 +32,14 @@ jobs:
 
       # - uses: ./.github/actions/clean-disk
 
-      - uses: DeterminateSystems/nix-installer-action@v13
+      - uses: DeterminateSystems/nix-installer-action@v14
         with:
           source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
           extra-conf: |
             experimental-features = pipe-operator
             accept-flake-config = true
 
-      - uses: DeterminateSystems/magic-nix-cache-action@v7
+      - uses: DeterminateSystems/magic-nix-cache-action@v8
 
       - uses: cachix/cachix-action@v15
         with:

.github/workflows/checks.yml

@@ -22,7 +22,7 @@ jobs:
         with:
           extra-conf: |
             accept-flake-config = true
-      - uses: DeterminateSystems/magic-nix-cache-action@v7
+      - uses: DeterminateSystems/magic-nix-cache-action@v8
 
       - uses: cachix/cachix-action@v15
         with:

.github/workflows/update.yml

@@ -24,7 +24,7 @@ jobs:
 
       - run: git checkout -B flake-lock
 
-      - uses: DeterminateSystems/nix-installer-action@v13
+      - uses: DeterminateSystems/nix-installer-action@v14
         with:
           source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
           extra-conf: |
@@ -80,7 +80,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: DeterminateSystems/nix-installer-action@v13
+      - uses: DeterminateSystems/nix-installer-action@v14
         with:
           source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
           extra-conf: |

README.md

@@ -55,30 +55,18 @@ nix run "github:daylinmorgan/oizys"
 
 ```
 nix begat oizys
-
 Usage:
-  oizys [command]
+  oizys {SUBCMD} [sub-command options & parameters]
 
-Available Commands:
+subcommands:
-  build                   nix build
+  help   print comprehensive or per-cmd help
-  cache                   build and push to cachix
+  build  nix build
-  checks                  nix build checks
+  cache  build and push to cachix
-  ci                      offload build to GHA
+  ci     trigger GHA update flow
-  dry                     poor man's nix flake check
+  dry    dry run build
-  help                    Help about any command
+  os     nixos-rebuild
-  os                      nixos-rebuild wrapper
+  output output
-  output                  show nixosConfiguration attr
+  update update and run nixos-rebuild
-  update                  update and run nixos rebuild
-
-Flags:
-      --debug          show debug output
-      --flake string   path to flake ($OIZYS_DIR or $HOME/oizys)
-  -h, --help           help for oizys
-      --host string    host(s) to build (current host)
-      --reset-cache    set narinfo-cache-negative-ttl to 0
-  -v, --verbose        show verbose output
-
-Use "oizys [command] --help" for more information about a command.
 ```
 
 ## oizys?

flake.lock

@@ -323,11 +323,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1726353438,
+        "lastModified": 1726430622,
-        "narHash": "sha256-DLSpQXNt6LLkhREYrnhU+/XrfDNiSN41iD575ua9+yA=",
+        "narHash": "sha256-50vt1snpVwS5lqvvH4p6DHiEWspJUZuJ1kYy1DKtrfM=",
         "ref": "refs/heads/main",
-        "rev": "e74efd87e5aa38f9cf84cb3848ee1ab26e5e4bcb",
+        "rev": "9e356562446f44c471ae38a80506a9df039305d6",
-        "revCount": 5221,
+        "revCount": 5224,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland/"
@@ -488,11 +488,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1725797487,
+        "lastModified": 1726402305,
-        "narHash": "sha256-1NqTS6PePeoLVH8UY6poIoxlNq1Hhgn7RZs+OT8b2wQ=",
+        "narHash": "sha256-Ps21x+17J0rclqg68crak2Vo/P3+1fZStqmV+OI7k6M=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "3c180ce6583583285ef1b105cbc1667ba00c3e8d",
+        "rev": "90b637e33ab9be23e0ba3c57905a1837561923ea",
         "type": "github"
       },
       "original": {
@@ -504,11 +504,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1726342126,
+        "lastModified": 1726411950,
-        "narHash": "sha256-SqATcoZoC90sjVXmjBpvXAiksQfTGR08nuZh4h8esY0=",
+        "narHash": "sha256-OnPGWKN3mJCsbdt4zOCVSTWg8N9QX+VTCXDcYviStTk=",
-        "rev": "727258241fc0b3c02691b72302d2c3092baca275",
+        "rev": "80202e3ca314c21547c48f3a23d3f629cd9ddb87",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/727258241fc0b3c02691b72302d2c3092baca275.tar.gz?rev=727258241fc0b3c02691b72302d2c3092baca275"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/80202e3ca314c21547c48f3a23d3f629cd9ddb87.tar.gz?rev=80202e3ca314c21547c48f3a23d3f629cd9ddb87"
       },
       "original": {
         "type": "tarball",
@@ -605,11 +605,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1723372011,
+        "lastModified": 1726529941,
-        "narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=",
+        "narHash": "sha256-jj7gvddyUQ3xnZxApiGv5xQaa75f1hYKFdtOfvtkcZ0=",
         "owner": "nix-community",
         "repo": "nix-eval-jobs",
-        "rev": "8802412b8747633e9d80639897e4d58fa6290909",
+        "rev": "a7cdbbbd9a7755489267dfd1297c613c824a5920",
         "type": "github"
       },
       "original": {
@@ -647,11 +647,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725765290,
+        "lastModified": 1726449931,
-        "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=",
+        "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "642275444c5a9defce57219c944b3179bf2adaa9",
+        "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
         "type": "github"
       },
       "original": {
@@ -692,11 +692,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1725882169,
+        "lastModified": 1726477654,
-        "narHash": "sha256-v5L+Dh6KdyycIgcdIc6SQ1fRNNvFJmYz02+fyeptA2o=",
+        "narHash": "sha256-nE34QJfnkLZyZIVOXd73iICyvYROVSOo4h7pVRs0mqg=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "34b95b3962f5b3436d4bae5091d1b2ff7c1eb180",
+        "rev": "20630a560fa658b1f4fc16e6ef2b6b3d6f8539f5",
         "type": "github"
       },
       "original": {
@@ -723,11 +723,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1725757153,
+        "lastModified": 1726362065,
-        "narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=",
+        "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7",
+        "rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555",
         "type": "github"
       },
       "original": {
@@ -744,11 +744,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1726348607,
+        "lastModified": 1726530502,
-        "narHash": "sha256-9Y3WXlXemlgmyzusDn4igL6UYg0Ye2fi7fcQL/gg6BA=",
+        "narHash": "sha256-ls3VME2/LC1beE63N4KFGCjmUyzMY13evwX9Xi5kJ7A=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "f7a91cffe777b139d0b4e4e54d480950018ab37b",
+        "rev": "6002e05eb85219d1018b3d3f6c8692ac26e2642a",
         "type": "github"
       },
       "original": {
@@ -775,11 +775,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1725693463,
+        "lastModified": 1726320982,
-        "narHash": "sha256-ZPzhebbWBOr0zRWW10FfqfbJlan3G96/h3uqhiFqmwg=",
+        "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "68e7dce0a6532e876980764167ad158174402c6f",
+        "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
         "type": "github"
       },
       "original": {
@@ -791,11 +791,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1726062873,
+        "lastModified": 1726243404,
-        "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
+        "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
+        "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
         "type": "github"
       },
       "original": {
@@ -823,11 +823,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1726062873,
+        "lastModified": 1726243404,
-        "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
+        "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
+        "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
         "type": "github"
       },
       "original": {
@@ -900,11 +900,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1726146664,
+        "lastModified": 1726501651,
-        "narHash": "sha256-lDUWuoj+iNGdHec5FnzDemhxs7xQgSAMcBlr+vrbTQk=",
+        "narHash": "sha256-W2az8KESGyK1PZtJ1SIriu0VRzlCmyVfmnHwa0exMK8=",
         "owner": "roc-lang",
         "repo": "roc",
-        "rev": "1993cd336b95b9b76d22db1e9e7821de68263910",
+        "rev": "38674aeb9415c47b5ea1c397a7c7f8378cd5cbaf",
         "type": "github"
       },
       "original": {
@@ -1112,11 +1112,11 @@
       },
       "locked": {
         "dir": "nix",
-        "lastModified": 1726326914,
+        "lastModified": 1726527644,
-        "narHash": "sha256-QMOS1KxI1tY3Rxtpc8UkG5vLBonybjJTiNT89ENOvo0=",
+        "narHash": "sha256-WAruDParTj7AY16SNjTDPgXf54vJCQRpRAiED3x9FIM=",
         "owner": "daylinmorgan",
         "repo": "tsm",
-        "rev": "8c866db5f020cbdbe9ea9123ce4b92478b41ede5",
+        "rev": "5991d93bcb216c4cd5345296111fee7027be29cf",
         "type": "github"
       },
       "original": {
@@ -1184,11 +1184,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726315777,
+        "lastModified": 1726532622,
-        "narHash": "sha256-lbEfQ3ZWUsmJMeWbrUYDKIIYYas+GUdZVbtgn6txTfU=",
+        "narHash": "sha256-BGaIY1UMGkHbtwlGixSiuzM+g8Nnkvec9fmas3jie/I=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "25f9cfc60ec930a6abb0be1ff89b3e27cda1cb59",
+        "rev": "42a7e61fa262d2fe3df7c9544938ef0dd2a2a56a",
         "type": "github"
       },
       "original": {
@@ -1209,11 +1209,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725812318,
+        "lastModified": 1726516447,
-        "narHash": "sha256-kqPJwnlhGByYBE1gqr7WI7O/Em8LmLPTBhPEST8OA8s=",
+        "narHash": "sha256-CV6Mr2zm5ZmtW4RnC3taJqA0tZ0U0ERzLBoO6GfzGWA=",
         "owner": "zigtools",
         "repo": "zls",
-        "rev": "dd78968d4c8deefd33addc2b1cc14f60d89ec1a9",
+        "rev": "cf9b49a67b15693d62926ea11d17f53efc60be50",
         "type": "github"
       },
       "original": {

pkgs/oizys-nim/src/oizys.nim

@@ -95,10 +95,9 @@ proc setupCligen() =
   let isColor = getEnv("NO_COLOR") == ""
   if clCfg.useMulti == "":
     clCfg.useMulti =
-      if isColor:
+      if isColor: "${doc}\e[1mUsage\e[m:\n  $command {SUBCMD} [sub-command options & parameters]\n\n\e[1msubcommands\e[m:\n$subcmds"
-        "${doc}\e[1mUsage\e[m:\n  $command {SUBCMD} [sub-command options & parameters]\n\n\e[1msubcommands\e[m:\n$subcmds"
+      else: "${doc}Usage:\n  $command {SUBCMD} [sub-command options & parameters]\n\nsubcommands:\n$subcmds"
-      else:
+
-        "${doc}Usage:\n  $command {SUBCMD} [sub-command options & parameters]\n\nsubcommands:\n$subcmds"
   if not isColor: return
   if clCfg.helpAttr.len == 0:
     clCfg.helpAttr = {"cmd": "\e[1;36m", "clDescrip": "", "clDflVal": "\e[33m",

pkgs/oizys-nim/src/oizys/nix.nim

@@ -162,7 +162,7 @@ proc systemPathDrvsToBuild(): seq[string] =
   result = inputDrvs.filterIt(it in toBuild)
   let nToBuild = result.len
   result = result.filterIt(not it.isIgnored)
-  let nIgnored = result.len - nToBuild
+  let nIgnored = nToBuild - result.len
   debug fmt"ignored {nIgnored} derivations"
   result = result.mapIt(it & "^*")