summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-07-26 18:18:41 +0200
committermakefu <github@syntax-fehler.de>2015-07-26 18:18:41 +0200
commit09ab49dfcab63a3a7d8c19c58f320ab294daa50f (patch)
tree4864459542aff05c564b1fd74ba2f15f9a04252a
parentc355a1d86250aca3f5757082ddd392ef867ca4ee (diff)
use new krebs config for hostname
-rw-r--r--1systems/makefu/pnp.nix9
-rw-r--r--2configs/makefu/base.nix5
2 files changed, 7 insertions, 7 deletions
diff --git a/1systems/makefu/pnp.nix b/1systems/makefu/pnp.nix
index 7e4ccf2c1..1019c4d70 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 25b80930b..b052b13e4 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
];