mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-22 01:50:44 -06:00
Compare commits
No commits in common. "c56c7910884f449f41323947ce16691a3cdabb96" and "56e2ca0d2d984232f97f5a730649399dbc867b31" have entirely different histories.
c56c791088
...
56e2ca0d2d
3 changed files with 18 additions and 20 deletions
|
@ -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"
|
||||
}
|
||||
},
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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; });
|
||||
|
|
Loading…
Reference in a new issue