diff options
author | tv <tv@krebsco.de> | 2015-07-26 21:19:41 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2015-07-26 21:19:41 +0200 |
commit | d95f0c1b7386e2d3f1d519379c6b6e2b5fdf534d (patch) | |
tree | b04247718a4f5d1885ae677ffc8da425213ccbeb | |
parent | fc7e21f0af3b75248f78e47138c32dbb61370061 (diff) | |
parent | 718bc6ffcc9523682cdfe421913b84cea00234d2 (diff) |
Merge remote-tracking branch 'pnp/master'
-rw-r--r-- | 1systems/makefu/pnp.nix | 9 | ||||
-rw-r--r-- | 2configs/makefu/base.nix | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/1systems/makefu/pnp.nix b/1systems/makefu/pnp.nix index 7e4ccf2..1019c4d 100644 --- a/1systems/makefu/pnp.nix +++ b/1systems/makefu/pnp.nix @@ -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 ]; } diff --git a/2configs/makefu/base.nix b/2configs/makefu/base.nix index 25b8093..b052b13 100644 --- a/2configs/makefu/base.nix +++ b/2configs/makefu/base.nix @@ -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 ]; |