mirror of
https://github.com/gensokyo-zone/infrastructure.git
synced 2026-02-09 04:19:19 -08:00
Depot cannot be stopped and neither can I
This commit is contained in:
parent
1f613c6fb7
commit
01460123a6
256 changed files with 15 additions and 15 deletions
4
.gitmodules
vendored
4
.gitmodules
vendored
|
|
@ -1,5 +1,5 @@
|
||||||
[submodule "config/trusted"]
|
[submodule "depot/trusted"]
|
||||||
path = config/trusted
|
path = depot/trusted
|
||||||
branch = main
|
branch = main
|
||||||
url = "https://git.kittywit.ch/kat/nixfiles-trusted.git"
|
url = "https://git.kittywit.ch/kat/nixfiles-trusted.git"
|
||||||
[submodule "wiki"]
|
[submodule "wiki"]
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 70c8d6bfd3e825db5edfd039d9ef75cee18ab462
|
|
||||||
|
|
@ -18,7 +18,7 @@ let
|
||||||
filterAttrNamesToList = filter: set:
|
filterAttrNamesToList = filter: set:
|
||||||
lib.foldl' (a: b: a ++ b) [ ]
|
lib.foldl' (a: b: a ++ b) [ ]
|
||||||
(map (e: if (filter e set.${e}) then [ e ] else [ ]) (lib.attrNames set));
|
(map (e: if (filter e set.${e}) then [ e ] else [ ]) (lib.attrNames set));
|
||||||
depotNames = lib.unique ((filterAttrNamesToList (name: type: name != "trusted" && type == "directory") (builtins.readDir ./config)) ++ (filterAttrNamesToList (name: type: name != "pkgs" && type == "directory") (builtins.readDir ./config/trusted)));
|
depotNames = lib.unique ((filterAttrNamesToList (name: type: name != "trusted" && type == "directory") (builtins.readDir ./depot)) ++ (filterAttrNamesToList (name: type: name != "pkgs" && type == "directory") (builtins.readDir ./depot/trusted)));
|
||||||
depot = lib.mapListToAttrs (folder: lib.nameValuePair folder (lib.domainMerge { inherit folder; })) depotNames;
|
depot = lib.mapListToAttrs (folder: lib.nameValuePair folder (lib.domainMerge { inherit folder; })) depotNames;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -34,8 +34,8 @@ let
|
||||||
modules = lib.singleton metaConfig
|
modules = lib.singleton metaConfig
|
||||||
++ lib.attrValues (removeAttrs depot.targets ["common"])
|
++ lib.attrValues (removeAttrs depot.targets ["common"])
|
||||||
++ lib.attrValues depot.hosts
|
++ lib.attrValues depot.hosts
|
||||||
++ lib.optional (builtins.pathExists ./config/trusted/meta.nix) ./config/trusted/meta.nix
|
++ lib.optional (builtins.pathExists ./depot/trusted/meta.nix) ./depot/trusted/meta.nix
|
||||||
++ lib.singleton ./config/modules/meta/default.nix;
|
++ lib.singleton ./depot/modules/meta/default.nix;
|
||||||
|
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit sources;
|
inherit sources;
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue