Compare commits

..

No commits in common. "c56c7910884f449f41323947ce16691a3cdabb96" and "56e2ca0d2d984232f97f5a730649399dbc867b31" have entirely different histories.

3 changed files with 18 additions and 20 deletions

View file

@ -729,17 +729,17 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1727483986, "lastModified": 1726640797,
"narHash": "sha256-8F97zAu+icDC9ZYS7m+Y58oZQ7R3gVuXMvzAfgkVmJo=", "narHash": "sha256-tuqkFa7ZxcGwU8gTbKO61oGMdTmG9CiaI+NiaOV7SCI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixd", "repo": "nixd",
"rev": "05ff3db3d1da26eafd5f58c7104e4f9ff6630894", "rev": "e2f0d908d6f2ee7bf72c620ed3c78817143b50ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "2.4.0",
"repo": "nixd", "repo": "nixd",
"rev": "e2f0d908d6f2ee7bf72c620ed3c78817143b50ae",
"type": "github" "type": "github"
} }
}, },

View file

@ -10,7 +10,7 @@
nixos-wsl.url = "github:nix-community/NixOS-WSL"; nixos-wsl.url = "github:nix-community/NixOS-WSL";
nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.url = "github:nix-community/nix-index-database";
# pipe support added # pipe support added
nixd.url = "github:nix-community/nixd/2.4.0"; nixd.url = "github:nix-community/nixd/e2f0d908d6f2ee7bf72c620ed3c78817143b50ae";
lix = { lix = {
url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";

View file

@ -47,22 +47,21 @@ let
# ["a" "b"] -> {a.enable = true; b.enable = true;} # ["a" "b"] -> {a.enable = true; b.enable = true;}
enableAttrs = enableAttrs =
attrs: attrs:
attrs listToAttrs (
|> map (attr: { map (attr: {
name = attr; name = attr;
value = enabled; value = enabled;
}) }) attrs
|> listToAttrs; );
# ["a" "b"] -> {a.enable = false; b.enable = false;} # ["a" "b"] -> {a.enable = false; b.enable = false;}
disableAttrs = disableAttrs =
attrs: attrs:
attrs listToAttrs (
|> map (attr: { map (attr: {
name = attr; name = attr;
value = disabled; value = disabled;
}) }) attrs
|> listToAttrs; );
mkIfIn = name: list: prev.mkIf (builtins.elem name list); mkIfIn = name: list: prev.mkIf (builtins.elem name list);
@ -111,8 +110,7 @@ let
}; };
loadOverlays = loadOverlays =
inputs: dir: inputs: dir: readDir dir
readDir dir
|> attrNames |> attrNames
|> filter (f: f != "default.nix") |> filter (f: f != "default.nix")
|> map (f: import (../overlays + "/${f}") { inherit inputs; }); |> map (f: import (../overlays + "/${f}") { inherit inputs; });