flake.lock: Update

Flake lock file updates: • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=5c6c300abfea2539ffad9bcbf857325eec5ab765' (2024-09-30) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=de68e065fe861d7ca01eca267df4c305bc6e73c2' (2024-10-02) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/06cf0e1da4208d3766d898b7fdab6513366d45b9' (2024-09-29) → 'github:nixos/nixpkgs/27e30d177e57d912d614c88c622dcfdb2e6e6515' (2024-10-01) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/50e4446e6dce9e1e52455f5b87bb91e83a538468' (2024-09-30) → 'github:nix-community/nixpkgs-wayland/a40e6b047b6166aed5fab801e99a8d6b980d4680' (2024-10-01) • Updated input 'roc': 'github:roc-lang/roc/aaeefc09b60313a28597372d3fdec041c1b96a22' (2024-10-01) → 'github:roc-lang/roc/2c62f773efaa08302dd8e765f4dba91a0cdbde8d' (2024-10-02)
2024-12-21 21:50:43 -06:00 · 2024-10-03 00:39:59 +00:00
7 changed files with 56 additions and 86 deletions
--- a/flake.lock
+++ b/flake.lock
@ -357,11 +357,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1727992844,
-        "narHash": "sha256-4qhURtbqfaaGfBRz+Fu3iT2QOW7xn7Cl749i5SRZEQM=",
+        "lastModified": 1727900725,
+        "narHash": "sha256-yS4oC5G/FKrsrRjk03cGzTEXHAwfjP7azFHoKvlFfD8=",
        "ref": "refs/heads/main",
-        "rev": "aed529f695bc62f5fa45dc94c545275ebb49bc48",
-        "revCount": 5288,
+        "rev": "de68e065fe861d7ca01eca267df4c305bc6e73c2",
+        "revCount": 5287,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland/"
@ -729,17 +729,17 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1727483986,
-        "narHash": "sha256-8F97zAu+icDC9ZYS7m+Y58oZQ7R3gVuXMvzAfgkVmJo=",
+        "lastModified": 1726640797,
+        "narHash": "sha256-tuqkFa7ZxcGwU8gTbKO61oGMdTmG9CiaI+NiaOV7SCI=",
        "owner": "nix-community",
        "repo": "nixd",
-        "rev": "05ff3db3d1da26eafd5f58c7104e4f9ff6630894",
+        "rev": "e2f0d908d6f2ee7bf72c620ed3c78817143b50ae",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "2.4.0",
        "repo": "nixd",
+        "rev": "e2f0d908d6f2ee7bf72c620ed3c78817143b50ae",
        "type": "github"
      }
    },
@ -977,11 +977,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727969805,
-        "narHash": "sha256-eotOuafJ+KcfEYuZVYYTdcj0ST3RG+GOEsomkOQqYp0=",
+        "lastModified": 1727382008,
+        "narHash": "sha256-t9SNSBXzECHI5KdWbJXsN2ATpXqq7JBGag/1BgY3yfE=",
        "owner": "daylinmorgan",
        "repo": "pixi-flake",
-        "rev": "d4ea6b52b804cd20d4b661b568389e35e372e2f5",
+        "rev": "935278026a29a12589bb594533905d329bd16a9d",
        "type": "github"
      },
      "original": {
@ -1311,11 +1311,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728001744,
-        "narHash": "sha256-6bYvaXkZK4XZ8o2cyjWkv5pvJKXHioQ9nJbW+7qaURQ=",
+        "lastModified": 1727656237,
+        "narHash": "sha256-qfZ7nYqYmzPc3Ei9hvWRrFu3Mn3WJ2akyYvaoPOOHcM=",
        "owner": "mitchellh",
        "repo": "zig-overlay",
-        "rev": "a2aa0972982b43cff53b409075512874a9887bc2",
+        "rev": "5bdd678ad99cd0069dfa6a5822c1d82d45d34ad2",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -10,7 +10,7 @@
    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/2.4.0";
+    nixd.url = "github:nix-community/nixd/e2f0d908d6f2ee7bf72c620ed3c78817143b50ae";

    lix = {
      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
--- a/lib/extended.nix
+++ b/lib/extended.nix
@ -47,22 +47,21 @@ let
  # ["a" "b"] -> {a.enable = true; b.enable = true;}
  enableAttrs =
    attrs:
-    attrs
-    |> map (attr: {
-      name = attr;
-      value = enabled;
-    })
-    |> listToAttrs;
-
+    listToAttrs (
+      map (attr: {
+        name = attr;
+        value = enabled;
+      }) attrs
+    );
  # ["a" "b"] -> {a.enable = false; b.enable = false;}
  disableAttrs =
    attrs:
-    attrs
-    |> map (attr: {
-      name = attr;
-      value = disabled;
-    })
-    |> listToAttrs;
+    listToAttrs (
+      map (attr: {
+        name = attr;
+        value = disabled;
+      }) attrs
+    );

  mkIfIn = name: list: prev.mkIf (builtins.elem name list);

@ -111,8 +110,7 @@ let
  };

  loadOverlays =
-    inputs: dir:
-    readDir dir
+    inputs: dir: readDir dir
    |> attrNames
    |> filter (f: f != "default.nix")
    |> map (f: import (../overlays + "/${f}") { inherit inputs; });
--- 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-RceRnhEkei3RfSCTOJsIiw4GSCyhOZhKoEVHNSw/KvA=";
+  nimbleDepsHash = "sha256-3p+PdGkQmKwz5tzJwX0aun3kSOLw/lwzqRkR9+6ECQE=";
 }
--- a/pkgs/oizys-nim/nimble.lock
+++ b/pkgs/oizys-nim/nimble.lock
@ -13,12 +13,12 @@
    },
    "hwylterm": {
      "version": "0.1.0",
-      "vcsRevision": "7e82f7ba5a24d816a79b3a5ea49f32b4c7a5ef7e",
+      "vcsRevision": "d852761831bd748db24b42f15bc8e2d286232295",
      "url": "https://github.com/daylinmorgan/hwylterm",
      "downloadMethod": "git",
      "dependencies": [],
      "checksums": {
-        "sha1": "d6d97bdff3fcdfcf4b39b144fa5f27a6b9f9494d"
+        "sha1": "7de2a93a03bd0659d8d70cc7c08315e0a7f15439"
      }
    },
    "jsony": {
--- a/pkgs/oizys-nim/src/oizys.nim
+++ b/pkgs/oizys-nim/src/oizys.nim
@ -1,8 +1,13 @@
 ## nix begat oizys
 import std/[os, tables, sequtils, strformat, strutils]
 import hwylterm, hwylterm/[cligen, logging]
-import oizys/[context, github, nix, overlay, logging]
+import oizys/[context, github, nix, overlay]# 3, logging

+addHandler(
+  newFancyConsoleLogger(
+    fmtPrefix = $bb"[b magenta]oizys"
+  )
+)

 proc confirm(q: string): bool =
  stderr.write $(q & bb"[yellow] (Y/n) ")
@ -23,7 +28,7 @@ overlay:
    resetCache: bool = false,
    rest: seq[string],
  ) =
-    setupLoggers(debug)
+    if not debug: setLogFilter(lvlInfo)
    updateContext(host, flake, debug, resetCache)

  proc dry(minimal: bool = false) =
@ -77,6 +82,16 @@ proc checkExes() =
  if findExe("nix") == "":
    fatalQuit "oizys requires nix"

+func `//`[A, B](pairs: openArray[(A, B)]): Table[A, B] =
+  pairs.toTable()
+func `//`[A, B](t1: var Table[A,B], t2: Table[A,B]) =
+  for k, v in t2.pairs(): t1[k] = v
+func `//`[A, B](t1: Table[A, B], t2: Table[A, B]): Table[A, B] =
+  result // t1; result // t2
+func `//`[A, B](pairs: openArray[(A,B)], t2: Table[A,B]): Table[A,B] =
+  // pairs // t2
+
+

 when isMainModule:
  import cligen
@ -100,15 +115,17 @@ when isMainModule:
      "name"       : "name of cachix binary cache"
    } // sharedHelp
  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 = clCfg.use ],
-    [cache,  help = cacheHelp , usage = clCfg.use ],
-    [ci,     help = ciHelp    , usage = clCfg.use ],
-    [dry,    help = sharedHelp, usage = clCfg.use ],
+    [build,  help = sharedHelp, usage = clUse ],
+    [cache,  help = cacheHelp , usage = clUse ],
+    [ci,     help = ciHelp    , usage = clUse ],
+    [dry,    help = sharedHelp, usage = clUse ],
    [osCmd,  help = sharedHelp, usage = osUsage, cmdName = "os"],
-    [output, help = sharedHelp, usage = clCfg.use],
-    [update, help = updateHelp, usage = clCfg.use],
+    [output, help = sharedHelp, usage = clUse],
+    [update, help = updateHelp, usage = clUse],
  )

--- a/pkgs/oizys-nim/src/oizys/logging.nim
+++ b/pkgs/oizys-nim/src/oizys/logging.nim
@ -1,45 +0,0 @@
-## nix begat oizys
-import std/[logging, os]
-import hwylterm, hwylterm/logging
-export logging
-
-
-proc getDataDir(): string =
-  ## Returns the data directory of the current user for applications.
-  # follows std/os.getCacheDir
-  # which in turn follows https://crates.io/crates/platform-dirs
-  result =
-    when defined(windows):
-      getEnv("LOCALAPPDATA")
-    elif defined(osx):
-      getEnv("XDG_DATA_HOME", getEnv("HOME") / "Library/Application Support")
-    else:
-      getEnv("XDG_DATA_HOME", getEnv("HOME") / ".local/share")
-
-  result.normalizePathEnd(false)
-
-proc getOizysLogPath(): string =
-  let dataDir = getDataDir()
-  createDir(dataDir / "oizys")
-  result = dataDir / "oizys" / "oizys.log"
-
-
-setLogFilter(lvlAll)
-
-proc setupLoggers*(debug: bool) =
-  let logLevel =
-    if not debug: lvlInfo
-    else: lvlAll
-  addHandler(
-    newFancyConsoleLogger(
-      fmtPrefix = $bb"[b magenta]oizys",
-      levelThreshold = logLevel
-    )
-  )
-  addHandler(
-    newRollingFileLogger(
-      getOizysLogPath(),
-      mode = fmAppend,
-      fmtStr = "$datetime | $levelid:"
-    )
-  )