kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-10 04:49:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

ygg: Added grimoire (phone)

Browse source
This commit is contained in:
kat witch 2021-04-26 01:29:39 +01:00
parent ce890b63ff
commit aa1f72eeca
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hosts/dummy/nixos/default.nix
View file

@ -18,10 +18,15 @@ in {
enable = true;
pubkey = "0000000000000000000000000000000000000000000000000000000000000000";
listen.enable = true;
listen.endpoints = flatten (map (c: c.listen.endpoints) (filter (c: c.listen.enable) (attrValues hexYgg)));
listen.endpoints = flatten (map (c: c.listen.endpoints)
(filter (c: c.listen.enable) (attrValues hexYgg)));
extra.pubkeys = {
satorin = "53d99a74a648ff7bd5bc9ba68ef4f472fb4fb8b2e26dfecea33c781f0d5c9525";
shanghai = "0cc3c26366cbfddfb1534b25c5655733d8f429edc941bcce674c46566fc87027";
satorin =
"53d99a74a648ff7bd5bc9ba68ef4f472fb4fb8b2e26dfecea33c781f0d5c9525";
shanghai =
"0cc3c26366cbfddfb1534b25c5655733d8f429edc941bcce674c46566fc87027";
grimoire =
"2a1567a2848540070328c9e938c58d40f2b1a3f08982c15c7edc5dcabfde3330";
} // (mapAttrs (_: c: c.pubkey) hexYgg);
};

12
lib/deploy.nix
View file

@ -17,10 +17,14 @@ let
config = mkMerge (map (hostName:
mapAttrs (_: mkMerge) hosts.${hostName}.config.deploy.tf.out.set)
target);
}] ++ concatMap (hostName:
filter builtins.pathExists
(map (profile: ../profiles + "/${profile}/meta.nix") (attrNames
(filterAttrs (_: id) hosts.${hostName}.config.deploy.profile))))
}] ++ optional
(builtins.pathExists (../private/targets + "/${targetName}"))
(../private/targets + "/${targetName}")
++ optional (builtins.pathExists (../targets + "/${targetName}"))
(../targets + "/${targetName}") ++ concatMap (hostName:
filter builtins.pathExists
(map (profile: ../profiles + "/${profile}/meta.nix") (attrNames
(filterAttrs (_: id) hosts.${hostName}.config.deploy.profile))))
target;
deps = {

1
profiles/common/nixos/default.nix
View file

@ -3,7 +3,6 @@
{
imports = [
./system.nix
./net.nix
./access.nix
./locale.nix
./nix.nix

5
profiles/common/nixos/net.nix
View file

@ -1,5 +0,0 @@
{ config, lib, pkgs, sources, ... }:
{
services.tailscale.enable = true;
}