Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s 2 base: new paths, cosmetics

Browse Source
This commit is contained in:
makefu 2016-02-04 14:36:48 +01:00
parent e402c8ce1d
commit 5be8920fb0
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
shared/2configs/base.nix
View File

@ -16,20 +16,16 @@ with lib;
# TODO rename shared user to "krebs" # TODO rename shared user to "krebs"
krebs.build.user = mkDefault config.krebs.users.shared; krebs.build.user = mkDefault config.krebs.users.shared;
krebs.build.source = { krebs.build.source = {
git.nixpkgs = { upstream-nixpkgs = mkDefault {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
rev = "d0e3cca"; 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; networking.hostName = config.krebs.build.host.name;

7
shared/2configs/cgit-mirror.nix
View File

@ -2,12 +2,11 @@
with lib; with lib;
let let
rules = with git;[{ rules = with git; singleton {
# user = git-sync; user = [ git-sync ];
user = git-sync;
repo = [ stockholm-mirror ]; repo = [ stockholm-mirror ];
perm = push ''refs/*'' [ non-fast-forward create delete merge ]; perm = push ''refs/*'' [ non-fast-forward create delete merge ];
}]; };
stockholm-mirror = { stockholm-mirror = {
public = true; public = true;