bbansi was consumed by hwylterm

flake.lock

@@ -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,21 +138,6 @@
         "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"
@@ -518,7 +485,7 @@
     "lib-aggregate": {
       "inputs": {
         "flake-utils": "flake-utils_3",
-        "nixpkgs-lib": "nixpkgs-lib_2"
+        "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
         "lastModified": 1726600542,
@@ -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=",
@@ -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",

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";

hosts/othalan/default.nix

@@ -1,4 +1,6 @@
 {
+  lib,
+  config,
   enabled,
   enableAttrs,
   listify,
@@ -10,10 +12,8 @@
       nix-ld = enabled // {
         overkill = enabled;
       };
-      languages =
+      # languages = "misc|nim|node|nushell|python|roc|tex|zig" |> listify;
-        "misc|nim|node|nushell|python|tex"
+      languages = "misc|nim|node|nushell|python|roc|tex" |> listify;
-        # + "roc|zig"
-        |> listify;
     }
     // (
       ''

hosts/othalan/system.nix

@@ -5,13 +5,7 @@
   ...
 }:
 {
-  networking = {
+  networking.networkmanager = enabled;
-    networkmanager = enabled;
-    networking.extraHosts = ''
-      192.168.50.56 mannaz.local
-    '';
-  };
-
   services.fwupd = enabled;
   hardware.bluetooth = enabled // {
     powerOnBoot = true;

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;

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"

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=";
 }

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": {

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"
-

pkgs/oizys-nim/src/oizys.nim

@@ -1,10 +1,10 @@
 ## nix begat oizys
 import std/[os, tables, sequtils, strformat,strutils]
 
-import hwylterm
+import cligen, hwylterm
-import hwylterm/cli
 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,17 +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 with dispatchMutli ...
+  # setting clCfg.use wasn't working?
-    clUse* = $bb("$command $args\n${doc}[bold]Options[/]:\n$options")
-    osUsage = $bb("$command [[subcmd] $args\n$doc[bold]Options[/]:\n$options")
   dispatchMulti(
-    [build,  help = sharedHelp],
+    [build,  help = sharedHelp, usage = usage],
-    [cache,  help = cacheHelp ],
+    [cache,  help = cacheHelp,  usage = usage],
-    [ci,     help = ciHelp    ],
+    [ci,     help = ciHelp,     usage = usage],
-    [dry,    help = sharedHelp],
+    [dry,    help = sharedHelp, usage = usage],
     [osCmd,  help = sharedHelp, usage = osUsage, cmdName = "os"],
-    [output, help = sharedHelp],
+    [output, help = sharedHelp, usage = usage],
-    [update, help = updateHelp],
+    [update, help = updateHelp, usage = usage],
   )