Merge remote-tracking branch 'pnp/master'

This commit is contained in:
tv 2015-07-26 21:19:41 +02:00
commit 557090b2a2
2 changed files with 7 additions and 7 deletions

View File

@ -11,7 +11,8 @@
../../2configs/makefu/base.nix
../../2configs/makefu/cgit-retiolum.nix
];
krebs.enable = true;
krebs.build.host = config.krebs.hosts.pnp;
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/vda";
@ -39,14 +40,8 @@
];
};
nix.maxJobs = 2;
networking.hostName = "pnp"; # Define your hostname.
# $ nix-env -qaP | grep wget
environment.systemPackages = with pkgs; [
wget
git
gnumake
jq
];
}

View File

@ -3,6 +3,10 @@
with lib;
{
imports = [ ];
krebs.enable = true;
krebs.search-domain = "retiolum";
networking.hostName = config.krebs.build.host.name;
users.extraUsers = {
root = {
openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
@ -37,6 +41,7 @@ with lib;
environment.systemPackages = with pkgs; [
git
vim
gnumake
rxvt_unicode.terminfo
];