flake.lock: Update

Flake lock file updates: • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/e2d0b0171ddf364b687d091ee603d0c3a7079166' (2024-09-17) → 'github:nix-community/nixpkgs-wayland/0e4800bea63d6e60d1917c934ad7c5bba935d345' (2024-09-17) • Updated input 'zig-overlay': 'github:mitchellh/zig-overlay/a2f15c93b689b31044d5604fb0cd5bac818daf01' (2024-09-17) → 'github:mitchellh/zig-overlay/04a63b5774dc3f9d5be373b03f4e461fe3b7d9d2' (2024-09-18)
bbansi was consumed by hwylterm
2024-09-19 22:57:17 -05:00 · 2024-09-18 00:35:57 +00:00 · 2024-09-17 18:56:51 -05:00
8 changed files with 63 additions and 151 deletions
--- a/flake.lock
+++ b/flake.lock
@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726665257,
-        "narHash": "sha256-rEzEZtd3iyVo5RJ1OGujOlnywNf3gsrOnjAn1NLciD4=",
+        "lastModified": 1725753098,
+        "narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "752d0fbd141fabb5a1e7f865199b80e6e76f8d8e",
+        "rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52",
        "type": "github"
      },
      "original": {
@ -117,24 +117,6 @@
      }
    },
    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1714606777,
-        "narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "4d34ce6412bc450b1d4208c953dc97c7fc764f1a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
      "inputs": {
        "nixpkgs-lib": [
          "nixpkgs-wayland",
@ -156,31 +138,16 @@
        "type": "github"
      }
    },
-    "flake-root": {
-      "locked": {
-        "lastModified": 1713493429,
-        "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
-        "owner": "srid",
-        "repo": "flake-root",
-        "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "repo": "flake-root",
-        "type": "github"
-      }
-    },
    "flake-utils": {
      "inputs": {
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@ -356,11 +323,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1726681673,
-        "narHash": "sha256-n7EMRe/uMZ4QdM/DWsewc7LLRaR0GGzQIV3uu9BFZbU=",
+        "lastModified": 1726580240,
+        "narHash": "sha256-VBXNeRJMaiqbIietRihPYnWA7bFJO2wqqlPg0f9Xfjc=",
        "ref": "refs/heads/main",
-        "rev": "e6cf643f5ab1c1545fb858ab1fd9d7538ef9e0f3",
-        "revCount": 5235,
+        "rev": "3c9716acfd00c6ea1b7bcd1dc63f97b51cc09998",
+        "revCount": 5227,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland/"
@ -518,7 +485,7 @@
    "lib-aggregate": {
      "inputs": {
        "flake-utils": "flake-utils_3",
-        "nixpkgs-lib": "nixpkgs-lib_2"
+        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
        "lastModified": 1726600542,
@ -537,11 +504,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1726680400,
-        "narHash": "sha256-8S8PaAXd+S5ik8Bd/cDFVRgiieee08rzpDQ+UisvHZU=",
-        "rev": "2afdf1ed660d0592bf488fa1be68fe0666716421",
+        "lastModified": 1726590994,
+        "narHash": "sha256-CrvIEzBzvvfE7jGIXBv6hSYDxv4eYeHWAwVho5WrF48=",
+        "rev": "8ab5743904a06c78153281bf61b3aa8aa451a489",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2afdf1ed660d0592bf488fa1be68fe0666716421.tar.gz?rev=2afdf1ed660d0592bf488fa1be68fe0666716421"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8ab5743904a06c78153281bf61b3aa8aa451a489.tar.gz?rev=8ab5743904a06c78153281bf61b3aa8aa451a489"
      },
      "original": {
        "type": "tarball",
@ -560,11 +527,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726631249,
-        "narHash": "sha256-b2rMO8+jKjY55d8uynX7FjV4NIPu/WzPux0kWOAzwoo=",
-        "rev": "b0e6f359500d66670cc16f521e4f62d6a0a4864e",
+        "lastModified": 1725836728,
+        "narHash": "sha256-dCbHCwqrzcHlEsRilMX+KM3IfRV46ieGqDyAD3GgCSs=",
+        "rev": "353b25f0b6da5ede15206d416345a2ec4195b5c8",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b0e6f359500d66670cc16f521e4f62d6a0a4864e.tar.gz?rev=b0e6f359500d66670cc16f521e4f62d6a0a4864e"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/353b25f0b6da5ede15206d416345a2ec4195b5c8.tar.gz?rev=353b25f0b6da5ede15206d416345a2ec4195b5c8"
      },
      "original": {
        "type": "tarball",
@ -632,10 +599,10 @@
    },
    "nix-eval-jobs": {
      "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts",
        "nix-github-actions": "nix-github-actions",
        "nixpkgs": "nixpkgs_5",
-        "treefmt-nix": "treefmt-nix_2"
+        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
        "lastModified": 1726529941,
@ -693,30 +660,6 @@
        "type": "github"
      }
    },
-    "nixd": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "flake-root": "flake-root",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1726640797,
-        "narHash": "sha256-tuqkFa7ZxcGwU8gTbKO61oGMdTmG9CiaI+NiaOV7SCI=",
-        "owner": "nix-community",
-        "repo": "nixd",
-        "rev": "e2f0d908d6f2ee7bf72c620ed3c78817143b50ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixd",
-        "rev": "e2f0d908d6f2ee7bf72c620ed3c78817143b50ae",
-        "type": "github"
-      }
-    },
    "nixgl": {
      "inputs": {
        "flake-utils": [
@ -779,24 +722,6 @@
      }
    },
    "nixpkgs-lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1714253743,
-        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib_2": {
      "locked": {
        "lastModified": 1726362065,
        "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=",
@ -819,11 +744,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1726672918,
-        "narHash": "sha256-7PYu2k0QrRbIZR2iBDxACWo4ar3HfWMoORC/Zj01yQQ=",
+        "lastModified": 1726608298,
+        "narHash": "sha256-jnkrX5WjYDRh6kYHHmf0mjOSiJNtrqDI/h2coistP7w=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "8bfa0c8e3a4466bcc062c6668aeb51fb03182e36",
+        "rev": "0e4800bea63d6e60d1917c934ad7c5bba935d345",
        "type": "github"
      },
      "original": {
@ -998,7 +923,6 @@
        "lix-module": "lix-module",
        "nim2nix": "nim2nix",
        "nix-index-database": "nix-index-database",
-        "nixd": "nixd",
        "nixos-wsl": "nixos-wsl",
        "nixpkgs": "nixpkgs_4",
        "nixpkgs-wayland": "nixpkgs-wayland",
@ -1158,27 +1082,6 @@
      }
    },
    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixd",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1722330636,
-        "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_2": {
      "inputs": {
        "nixpkgs": [
          "nixpkgs-wayland",
@ -1281,11 +1184,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726661456,
-        "narHash": "sha256-UT3wZLMHec3AmuYSAoL5+liMZkeHlNeAa9Zjx6g6sE4=",
+        "lastModified": 1726619268,
+        "narHash": "sha256-YlVh/GZX/BA33RlkFRm3WZESFnVP0EXVLc/goXVYKVY=",
        "owner": "mitchellh",
        "repo": "zig-overlay",
-        "rev": "be1d29f1d47d42e205d3646e9202bf1fd051137c",
+        "rev": "04a63b5774dc3f9d5be373b03f4e461fe3b7d9d2",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -9,8 +9,6 @@
    nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
    nixos-wsl.url = "github:nix-community/NixOS-WSL";
    nix-index-database.url = "github:nix-community/nix-index-database";
-    # pipe support added
-    nixd.url = "github:nix-community/nixd/e2f0d908d6f2ee7bf72c620ed3c78817143b50ae";

    lix = {
      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
@ -35,7 +33,6 @@
    hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git";
    utils.url = "git+https://git.dayl.in/daylin/utils.git";

-    nixd.inputs.nixpkgs.follows = "nixpkgs";
    nim2nix.inputs.nixpkgs.follows = "nixpkgs";
    hyprman.inputs.nixpkgs.follows = "nixpkgs";
    f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";
--- a/modules/nix.nix
+++ b/modules/nix.nix
@ -4,7 +4,6 @@
  lib,
  enabled,
  self,
-  flake,
  ...
 }:
 let
@ -43,12 +42,11 @@ in
  # environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;

  environment.systemPackages = [
-    # pkgs.nixd
+    pkgs.nixd
    pkgs.nixfmt-rfc-style
    pkgs.nix-output-monitor

    self.packages.${pkgs.system}.default
-    (flake.pkg "nixd")
  ];

  programs.nix-index-database.comma = enabled;
--- a/pkgs/oizys-nim/config.nims
+++ b/pkgs/oizys-nim/config.nims
@ -6,5 +6,3 @@ task build, "build oizys":
 when withDir(thisDir(), system.fileExists("nimble.paths")):
  include "nimble.paths"
 # end Nimble config
-#
--path:"../../../dev/github/daylinmorgan/hwylterm/src"
--- a/pkgs/oizys-nim/default.nix
+++ b/pkgs/oizys-nim/default.nix
@ -8,5 +8,5 @@ buildNimblePackage {
  verions = "unstable";
  src = lib.cleanSource ./.;
  nativeBuildInputs = [ openssl ];
-  nimbleDepsHash = "sha256-o+CN0LlVOcgjLpDfjItW/5GCXTWcPSx9GfwQn+u2ST4=";
+  nimbleDepsHash = "sha256-U44sZSUcus9minOs/Euy4h071eU9Cn83RnYb5jiKibo=";
 }
--- a/pkgs/oizys-nim/nimble.lock
+++ b/pkgs/oizys-nim/nimble.lock
@ -13,12 +13,12 @@
    },
    "hwylterm": {
      "version": "0.1.0",
-      "vcsRevision": "9afc339a9791f25010ea89a4f52204ad8eeda858",
+      "vcsRevision": "f743d4b2dc93e41d0e8b5bb0a3e5f26ffc2534e1",
      "url": "https://github.com/daylinmorgan/hwylterm",
      "downloadMethod": "git",
      "dependencies": [],
      "checksums": {
-        "sha1": "853c67ee7f789d825ec6f46c9fbae68e03e43cdb"
+        "sha1": "5a5e00533d5cf2660872738cabf8b7572128b05b"
      }
    },
    "jsony": {
--- a/pkgs/oizys-nim/oizys.nimble
+++ b/pkgs/oizys-nim/oizys.nimble
@ -14,5 +14,4 @@ requires "nim >= 2.0.8"
 requires "cligen"
 requires "jsony"
 requires "zippy"
-requires "https://github.com/daylinmorgan/hwylterm#9afc339"
-
+requires "https://github.com/daylinmorgan/hwylterm#HEAD"
--- a/pkgs/oizys-nim/src/oizys.nim
+++ b/pkgs/oizys-nim/src/oizys.nim
@ -1,10 +1,10 @@
 ## nix begat oizys
 import std/[os, tables, sequtils, strformat,strutils]

-import hwylterm
-import hwylterm/cli
+import cligen, hwylterm
 import oizys/[context, github, nix, overlay, logging]

+
 addHandler(
  newFancyConsoleLogger(
    levelThreshold=lvlAll,
@ -91,11 +91,31 @@ proc `//`(t1: Table[string, string], t2: Table[string, string]): Table[string, s
  for k, v in t1.pairs(): result[k] = v
  for k, v in t2.pairs(): result[k] = v

+proc setupCligen() =
+  let isColor = getEnv("NO_COLOR") == ""
+  if clCfg.useMulti == "":
+    clCfg.useMulti =
+      if isColor: "${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"
+
+  if not isColor: return
+  if clCfg.helpAttr.len == 0:
+    clCfg.helpAttr = {"cmd": "\e[1;36m", "clDescrip": "", "clDflVal": "\e[33m",
+        "clOptKeys": "\e[32m", "clValType": "\e[31m", "args": "\e[3m"}.toTable()
+    clCfg.helpAttrOff = {"cmd": "\e[m", "clDescrip": "\e[m", "clDflVal": "\e[m",
+        "clOptKeys": "\e[m", "clValType": "\e[m", "args": "\e[m"}.toTable()
+    # clCfg.use  does nothing?
+    clCfg.useHdr = "\e[1musage\e[m:\n  "

 when isMainModule:
-  import cligen
  checkExes()
-  hwylCli(clCfg)
+  setupCligen()
+  let (optOpen, optClose) =
+    if getEnv("NO_COLOR") == "": ("\e[1m","\e[m")
+    else: ("","")
+  let
+    usage = &"$command [flags]\n$doc{optOpen}Options{optClose}:\n$options"
+    osUsage = &"$command [subcmd] [flags]\n$doc{optOpen}Options{optClose}:\n$options"

  const
    sharedHelp = {
@ -113,18 +133,15 @@ when isMainModule:
    cacheHelp = {
      "name"       : "name of cachix binary cache"
    }.toTable() // sharedHelp
-  let
-    # clUse must be set here using clCfg doesn't seem to work..
-    clUse* = $bb("$command $args\n${doc}[bold]Options[/]:\n$options")
-    osUsage = $bb("$command [[subcmd] $args\n$doc[bold]Options[/]:\n$options")

+  # setting clCfg.use wasn't working?
  dispatchMulti(
-    [build,  help = sharedHelp],
-    [cache,  help = cacheHelp ],
-    [ci,     help = ciHelp    ],
-    [dry,    help = sharedHelp],
+    [build,  help = sharedHelp, usage = usage],
+    [cache,  help = cacheHelp,  usage = usage],
+    [ci,     help = ciHelp,     usage = usage],
+    [dry,    help = sharedHelp, usage = usage],
    [osCmd,  help = sharedHelp, usage = osUsage, cmdName = "os"],
-    [output, help = sharedHelp],
-    [update, help = updateHelp],
+    [output, help = sharedHelp, usage = usage],
+    [update, help = updateHelp, usage = usage],
  )