mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-23 06:50:45 -06:00
Compare commits
4 commits
7c755099ef
...
1626f58535
| Author | SHA1 | Date | |
|---|---|---|---|
1626f58535
|
|||
|
ffb91a61b3
|
|||
|
a23f845086
|
|||
|
530997fc08
|
16 changed files with 151 additions and 195 deletions
103
flake.lock
103
flake.lock
|
|
@ -117,6 +117,24 @@
|
|||
}
|
||||
},
|
||||
"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",
|
||||
|
|
@ -138,6 +156,21 @@
|
|||
"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"
|
||||
|
|
@ -485,7 +518,7 @@
|
|||
"lib-aggregate": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726600542,
|
||||
|
|
@ -599,10 +632,10 @@
|
|||
},
|
||||
"nix-eval-jobs": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
"treefmt-nix": "treefmt-nix_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726529941,
|
||||
|
|
@ -660,6 +693,30 @@
|
|||
"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": [
|
||||
|
|
@ -722,6 +779,24 @@
|
|||
}
|
||||
},
|
||||
"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=",
|
||||
|
|
@ -923,6 +998,7 @@
|
|||
"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",
|
||||
|
|
@ -1082,6 +1158,27 @@
|
|||
}
|
||||
},
|
||||
"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",
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
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";
|
||||
|
|
@ -33,6 +35,7 @@
|
|||
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";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
enabled,
|
||||
enableAttrs,
|
||||
listify,
|
||||
|
|
@ -12,8 +10,10 @@
|
|||
nix-ld = enabled // {
|
||||
overkill = enabled;
|
||||
};
|
||||
# languages = "misc|nim|node|nushell|python|roc|tex|zig" |> listify;
|
||||
languages = "misc|nim|node|nushell|python|roc|tex" |> listify;
|
||||
languages =
|
||||
"misc|nim|node|nushell|python|tex"
|
||||
# + "roc|zig"
|
||||
|> listify;
|
||||
}
|
||||
// (
|
||||
''
|
||||
|
|
|
|||
|
|
@ -5,7 +5,13 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
networking.networkmanager = enabled;
|
||||
networking = {
|
||||
networkmanager = enabled;
|
||||
networking.extraHosts = ''
|
||||
192.168.50.56 mannaz.local
|
||||
'';
|
||||
};
|
||||
|
||||
services.fwupd = enabled;
|
||||
hardware.bluetooth = enabled // {
|
||||
powerOnBoot = true;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
lib,
|
||||
enabled,
|
||||
self,
|
||||
flake,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
@ -42,11 +43,12 @@ 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;
|
||||
|
|
|
|||
|
|
@ -6,3 +6,5 @@ task build, "build oizys":
|
|||
when withDir(thisDir(), system.fileExists("nimble.paths")):
|
||||
include "nimble.paths"
|
||||
# end Nimble config
|
||||
#
|
||||
--path:"../../../dev/github/daylinmorgan/hwylterm/src"
|
||||
|
|
|
|||
|
|
@ -8,5 +8,5 @@ buildNimblePackage {
|
|||
verions = "unstable";
|
||||
src = lib.cleanSource ./.;
|
||||
nativeBuildInputs = [ openssl ];
|
||||
nimbleDepsHash = "sha256-WeTbNoF+TuzWriqoHWk5DBVgBXtNBIBHMkwy8/+a2JA=";
|
||||
nimbleDepsHash = "sha256-o+CN0LlVOcgjLpDfjItW/5GCXTWcPSx9GfwQn+u2ST4=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,6 @@
|
|||
{
|
||||
"version": 2,
|
||||
"packages": {
|
||||
"bbansi": {
|
||||
"version": "0.1.1",
|
||||
"vcsRevision": "9a85d9ed028f06f1ed1ee6851480a51408a6004e",
|
||||
"url": "https://github.com/daylinmorgan/bbansi",
|
||||
"downloadMethod": "git",
|
||||
"dependencies": [],
|
||||
"checksums": {
|
||||
"sha1": "b338433f9a7a1b788b7583674c2b14096ced29ee"
|
||||
}
|
||||
},
|
||||
"cligen": {
|
||||
"version": "1.7.0",
|
||||
"vcsRevision": "4193f802796f15559c81c6dd56724d6f20345917",
|
||||
|
|
@ -21,6 +11,16 @@
|
|||
"sha1": "300bd7fdb6e48d2d98e34ed0661206b50331e99c"
|
||||
}
|
||||
},
|
||||
"hwylterm": {
|
||||
"version": "0.1.0",
|
||||
"vcsRevision": "9afc339a9791f25010ea89a4f52204ad8eeda858",
|
||||
"url": "https://github.com/daylinmorgan/hwylterm",
|
||||
"downloadMethod": "git",
|
||||
"dependencies": [],
|
||||
"checksums": {
|
||||
"sha1": "853c67ee7f789d825ec6f46c9fbae68e03e43cdb"
|
||||
}
|
||||
},
|
||||
"jsony": {
|
||||
"version": "1.1.5",
|
||||
"vcsRevision": "ea811bec7fa50f5abd3088ba94cda74285e93f18",
|
||||
|
|
|
|||
|
|
@ -14,4 +14,5 @@ requires "nim >= 2.0.8"
|
|||
requires "cligen"
|
||||
requires "jsony"
|
||||
requires "zippy"
|
||||
requires "https://github.com/daylinmorgan/bbansi#9a85d9e"
|
||||
requires "https://github.com/daylinmorgan/hwylterm#9afc339"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
## nix begat oizys
|
||||
import std/[os, tables, sequtils, strformat,strutils]
|
||||
|
||||
import cligen, bbansi
|
||||
import hwylterm
|
||||
import hwylterm/cli
|
||||
import oizys/[context, github, nix, overlay, logging]
|
||||
|
||||
|
||||
addHandler(
|
||||
newFancyConsoleLogger(
|
||||
levelThreshold=lvlAll,
|
||||
|
|
@ -91,31 +91,11 @@ 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()
|
||||
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"
|
||||
hwylCli(clCfg)
|
||||
|
||||
const
|
||||
sharedHelp = {
|
||||
|
|
@ -133,15 +113,17 @@ when isMainModule:
|
|||
cacheHelp = {
|
||||
"name" : "name of cachix binary cache"
|
||||
}.toTable() // sharedHelp
|
||||
|
||||
# setting clCfg.use wasn't working?
|
||||
let
|
||||
# clUse must be set here using clCfg doesn't seem to work with dispatchMutli ...
|
||||
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, usage = usage],
|
||||
[cache, help = cacheHelp, usage = usage],
|
||||
[ci, help = ciHelp, usage = usage],
|
||||
[dry, help = sharedHelp, usage = usage],
|
||||
[build, help = sharedHelp],
|
||||
[cache, help = cacheHelp ],
|
||||
[ci, help = ciHelp ],
|
||||
[dry, help = sharedHelp],
|
||||
[osCmd, help = sharedHelp, usage = osUsage, cmdName = "os"],
|
||||
[output, help = sharedHelp, usage = usage],
|
||||
[update, help = updateHelp, usage = usage],
|
||||
[output, help = sharedHelp],
|
||||
[update, help = updateHelp],
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import std/[logging, os, strformat, strutils]
|
||||
from std/nativesockets import getHostname
|
||||
import bbansi
|
||||
import hwylterm
|
||||
import ./logging
|
||||
|
||||
type
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import std/[
|
|||
strutils, streams, logging
|
||||
]
|
||||
|
||||
import ./spin
|
||||
import hwylterm
|
||||
|
||||
|
||||
func addArgs*(cmd: var string, args: openArray[string]) =
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import std/[httpclient,logging, os, strformat, strutils, json, tables, tempfiles]
|
||||
import jsony, bbansi, zippy/ziparchives
|
||||
import jsony, hwylterm, zippy/ziparchives
|
||||
import ./[logging, exec, context]
|
||||
|
||||
# localPassC is used by zippy but the additional
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import std/[logging,strutils]
|
||||
export logging
|
||||
|
||||
import bbansi
|
||||
import hwylterm
|
||||
|
||||
var
|
||||
handlers {.threadvar.}: seq[Logger]
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import std/[
|
|||
enumerate, os, sequtils, strformat,
|
||||
strutils, sugar, logging, tables
|
||||
]
|
||||
import bbansi, jsony
|
||||
import hwylterm, jsony
|
||||
import ./[context, exec, logging]
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,137 +0,0 @@
|
|||
import std/[os, locks, sequtils, terminal]
|
||||
|
||||
import bbansi
|
||||
|
||||
type
|
||||
SpinnerKind* = enum
|
||||
Dots
|
||||
Spinner* = object
|
||||
interval*: int
|
||||
frames*: seq[string]
|
||||
|
||||
proc makeSpinner*(interval: int, frames: seq[string]): Spinner =
|
||||
Spinner(interval: interval, frames: frames)
|
||||
|
||||
const Spinners*: array[SpinnerKind, Spinner] = [
|
||||
# Dots
|
||||
Spinner(interval: 80, frames: @["⠋","⠙","⠹","⠸","⠼","⠴","⠦","⠧","⠇","⠏"]),
|
||||
]
|
||||
|
||||
|
||||
type
|
||||
Spinny = ref object
|
||||
t: Thread[Spinny]
|
||||
lock: Lock
|
||||
text: string
|
||||
running: bool
|
||||
frames: seq[string]
|
||||
frame: string
|
||||
interval: int
|
||||
customSymbol: bool
|
||||
style: string
|
||||
|
||||
EventKind = enum
|
||||
Stop, SymbolChange, TextChange,
|
||||
|
||||
SpinnyEvent = object
|
||||
kind: EventKind
|
||||
payload: string
|
||||
|
||||
var spinnyChannel: Channel[SpinnyEvent]
|
||||
|
||||
proc newSpinny*(text: string, s: Spinner): Spinny =
|
||||
let style = "bold blue"
|
||||
Spinny(
|
||||
text: text,
|
||||
running: true,
|
||||
frames: mapIt(s.frames, $bb(it, style)),
|
||||
customSymbol: false,
|
||||
interval: s.interval,
|
||||
style: "bold blue"
|
||||
)
|
||||
|
||||
proc newSpinny*(text: string, spinType: SpinnerKind): Spinny =
|
||||
newSpinny(text, Spinners[spinType])
|
||||
|
||||
proc setSymbolColor*(spinny: Spinny, style: string) =
|
||||
spinny.frames = mapIt(spinny.frames, $bb(it, style))
|
||||
|
||||
proc setSymbol*(spinny: Spinny, symbol: string) =
|
||||
spinnyChannel.send(SpinnyEvent(kind: SymbolChange, payload: symbol))
|
||||
|
||||
proc setText*(spinny: Spinny, text: string) =
|
||||
spinnyChannel.send(SpinnyEvent(kind: TextChange, payload: text))
|
||||
|
||||
proc handleEvent(spinny: Spinny, eventData: SpinnyEvent): bool =
|
||||
result = true
|
||||
case eventData.kind
|
||||
of Stop:
|
||||
result = false
|
||||
of SymbolChange:
|
||||
spinny.customSymbol = true
|
||||
spinny.frame = eventData.payload
|
||||
of TextChange:
|
||||
spinny.text = eventData.payload
|
||||
|
||||
proc spinnyLoop(spinny: Spinny) {.thread.} =
|
||||
var frameCounter = 0
|
||||
|
||||
while spinny.running:
|
||||
let data = spinnyChannel.tryRecv()
|
||||
if data.dataAvailable:
|
||||
# If we received a Stop event
|
||||
if not spinny.handleEvent(data.msg):
|
||||
spinnyChannel.close()
|
||||
# This is required so we can reopen the same channel more than once
|
||||
# See https://github.com/nim-lang/Nim/issues/6369
|
||||
spinnyChannel = default(typeof(spinnyChannel))
|
||||
# TODO: Do we need spinny.running at all?
|
||||
spinny.running = false
|
||||
break
|
||||
|
||||
stdout.flushFile()
|
||||
if not spinny.customSymbol:
|
||||
spinny.frame = spinny.frames[frameCounter]
|
||||
|
||||
withLock spinny.lock:
|
||||
eraseLine()
|
||||
stdout.write(spinny.frame & " " & spinny.text)
|
||||
stdout.flushFile()
|
||||
|
||||
sleep spinny.interval
|
||||
|
||||
if frameCounter >= spinny.frames.len - 1:
|
||||
frameCounter = 0
|
||||
else:
|
||||
frameCounter += 1
|
||||
|
||||
proc start*(spinny: Spinny) =
|
||||
initLock spinny.lock
|
||||
spinnyChannel.open()
|
||||
createThread(spinny.t, spinnyLoop, spinny)
|
||||
|
||||
proc stop(spinny: Spinny, kind: EventKind, payload = "") =
|
||||
spinnyChannel.send(SpinnyEvent(kind: kind, payload: payload))
|
||||
spinnyChannel.send(SpinnyEvent(kind: Stop))
|
||||
joinThread spinny.t
|
||||
eraseLine stdout
|
||||
flushFile stdout
|
||||
|
||||
|
||||
proc stop*(spinny: Spinny) =
|
||||
spinny.stop(Stop)
|
||||
|
||||
template withSpinner*(msg: string = "", body: untyped): untyped =
|
||||
var spinner {.inject.} = newSpinny(msg, Dots)
|
||||
if isatty(stdout): # don't spin if it's not a tty
|
||||
start spinner
|
||||
|
||||
body
|
||||
|
||||
if isatty(stdout):
|
||||
stop spinner
|
||||
|
||||
template withSpinner*(body: untyped): untyped =
|
||||
withSpinner("", body)
|
||||
|
||||
|
||||
Loading…
Reference in a new issue