s 2 base: new paths, cosmetics
This commit is contained in:
parent
e402c8ce1d
commit
5be8920fb0
|
@ -16,20 +16,16 @@ with lib;
|
|||
# TODO rename shared user to "krebs"
|
||||
krebs.build.user = mkDefault config.krebs.users.shared;
|
||||
krebs.build.source = {
|
||||
git.nixpkgs = {
|
||||
upstream-nixpkgs = mkDefault {
|
||||
url = https://github.com/NixOS/nixpkgs;
|
||||
rev = "d0e3cca";
|
||||
target-path = "/var/src/nixpkgs";
|
||||
};
|
||||
dir.secrets = {
|
||||
host = config.krebs.current.host;
|
||||
path = mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}";
|
||||
};
|
||||
dir.stockholm = {
|
||||
host = config.krebs.current.host;
|
||||
path = mkDefault "${getEnv "HOME"}/stockholm";
|
||||
target-path = "/var/src/stockholm";
|
||||
};
|
||||
secrets = mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}";
|
||||
stockholm = mkDefault "${getEnv "HOME"}/stockholm";
|
||||
|
||||
nixos-config = "symlink:stockholm/${config.krebs.build.user.name}/1systems/${config.krebs.build.host.name}.nix";
|
||||
nixpkgs = symlink:stockholm/nixpkgs;
|
||||
stockholm-user = "symlink:stockholm/${config.krebs.build.user.name}";
|
||||
};
|
||||
|
||||
networking.hostName = config.krebs.build.host.name;
|
||||
|
|
|
@ -2,12 +2,11 @@
|
|||
|
||||
with lib;
|
||||
let
|
||||
rules = with git;[{
|
||||
# user = git-sync;
|
||||
user = git-sync;
|
||||
rules = with git; singleton {
|
||||
user = [ git-sync ];
|
||||
repo = [ stockholm-mirror ];
|
||||
perm = push ''refs/*'' [ non-fast-forward create delete merge ];
|
||||
}];
|
||||
};
|
||||
|
||||
stockholm-mirror = {
|
||||
public = true;
|
||||
|
|
Loading…
Reference in New Issue
Block a user