summaryrefslogtreecommitdiffstats
path: root/2configs
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-07-24 20:48:00 +0200
committertv <tv@shackspace.de>2015-07-24 20:49:46 +0200
commita62be1cef8726a2afa61df3dac9e19a71882b370 (patch)
tree9415cfbe7628cbcce03d1691ea02e71be7babc88 /2configs
parent54becaa19fcbc11ac709ddaf86e56ee3b736931d (diff)
{2 tv git -> 3 krebs}.users
Diffstat (limited to '2configs')
-rw-r--r--2configs/tv/git.nix22
1 files changed, 5 insertions, 17 deletions
diff --git a/2configs/tv/git.nix b/2configs/tv/git.nix
index ac1c413c4..b7f9983a1 100644
--- a/2configs/tv/git.nix
+++ b/2configs/tv/git.nix
@@ -1,4 +1,5 @@
{ config, lib, pkgs, ... }:
+
with import ../../4lib/tv { inherit lib pkgs; };
let
@@ -7,7 +8,7 @@ let
enable = true;
root-title = "public repositories at ${config.tv.identity.self.name}";
root-desc = "keep calm and engage";
- inherit repos rules users;
+ inherit repos rules;
};
};
@@ -43,20 +44,12 @@ let
restricted-repos = mapAttrs make-restricted-repo (
{
brain = {
- collaborators = with users; [ lass makefu ];
+ collaborators = with config.krebs.users; [ lass makefu ];
};
} //
- import /root/src/secrets/repos.nix { inherit config lib pkgs users; }
+ import /root/src/secrets/repos.nix { inherit config lib pkgs; }
);
- # TODO move users to separate module
- users = mapAttrs make-user {
- tv = ../../Zpubkeys/tv_wu.ssh.pub;
- lass = ../../Zpubkeys/lass.ssh.pub;
- uriel = ../../Zpubkeys/uriel.ssh.pub;
- makefu = ../../Zpubkeys/makefu.ssh.pub;
- };
-
make-public-repo = name: { desc ? null, ... }: {
inherit name desc;
public = true;
@@ -77,7 +70,7 @@ let
};
make-rules =
- with git // users;
+ with git // config.krebs.users;
repo:
singleton {
user = tv;
@@ -95,9 +88,4 @@ let
perm = fetch;
};
- make-user = name: pubkey-file: {
- inherit name;
- pubkey = readFile pubkey-file;
- };
-
in out