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

Update to nix-only build and user-toplevel

Browse Source 
pnp now contains information about the target
This commit is contained in:
makefu 2015-07-29 11:56:31 +02:00
commit 9381e5d28e
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
makefu/1systems/pnp.nix
View File

@ -12,6 +12,21 @@
../2configs/cgit-retiolum.nix ../2configs/cgit-retiolum.nix
]; ];
krebs.build.host = config.krebs.hosts.pnp; krebs.build.host = config.krebs.hosts.pnp;
krebs.build.user = config.krebs.users.makefu;
krebs.build.target = "root@pnp";
krebs.build.deps = {
nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
};
secrets = {
url = "/home/makefu/secrets/${config.krebs.build.host.name}";
};
stockholm = {
url = toString ../..;
};
};
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.version = 2; boot.loader.grub.version = 2;

21
makefu/2configs/cgit-retiolum.nix
View File

@ -1,17 +1,8 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
# TODO: remove tv lib :) # TODO: remove tv lib :)
with import ../../tv/4lib/{ inherit lib pkgs; }; with import ../../tv/4lib { inherit lib pkgs; };
let let
out = {
imports = [ ];
krebs.git = {
enable = true;
root-title = "public repositories ";
root-desc = "keep on krebsing";
inherit repos rules;
};
};
repos = priv-repos // krebs-repos ; repos = priv-repos // krebs-repos ;
rules = concatMap krebs-rules (attrValues krebs-repos) ++ concatMap priv-rules (attrValues priv-repos); rules = concatMap krebs-rules (attrValues krebs-repos) ++ concatMap priv-rules (attrValues priv-repos);
@ -67,4 +58,12 @@ let
krebs-rules = with config.krebs.users; repo: krebs-rules = with config.krebs.users; repo:
set-owners repo [ makefu ] ++ set-ro-access repo krebsminister ; set-owners repo [ makefu ] ++ set-ro-access repo krebsminister ;
in out in {
imports = [ ../../3modules/krebs/git.nix ];
krebs.git = {
enable = true;
root-title = "public repositories ";
root-desc = "keep on krebsing";
inherit repos rules;
};
}