summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-10-03 18:48:18 +0200
committertv <tv@krebsco.de>2017-10-03 18:48:18 +0200
commitd567c2c21e0fe029a069edda8eda28cd24771511 (patch)
treebcc1ea51b71b22c18ac653a1b4aded927e6c173e /makefu/1systems
parent32a8fc0396769946242ef8c1a48fb64ae572e0db (diff)
parent902a65304d1e07ce5a7192a0403d6fa1bed1f135 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/cake/config.nix20
-rw-r--r--makefu/1systems/cake/source.nix3
-rw-r--r--makefu/1systems/pnp/config.nix5
3 files changed, 26 insertions, 2 deletions
diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix
new file mode 100644
index 000000000..0630d19ad
--- /dev/null
+++ b/makefu/1systems/cake/config.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+{
+ imports = [
+ <stockholm/makefu>
+ # configure your hw:
+ # <stockholm/makefu/2configs/hw/CAC.nix>
+ # <stockholm/makefu/2configs/fs/CAC-CentOS-7-64bit.nix>
+ # <stockholm/makefu/2configs/save-diskspace.nix
+ ];
+ krebs = {
+ enable = true;
+ tinc.retiolum.enable = true;
+ build.host = config.krebs.hosts.cake;
+ };
+ # You want to change these :)
+ boot.loader.grub.device = "/dev/sda";
+ fileSystems."/" = {
+ device = "/dev/sda1";
+ };
+} \ No newline at end of file
diff --git a/makefu/1systems/cake/source.nix b/makefu/1systems/cake/source.nix
new file mode 100644
index 000000000..797417a1d
--- /dev/null
+++ b/makefu/1systems/cake/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+ name="cake";
+} \ No newline at end of file
diff --git a/makefu/1systems/pnp/config.nix b/makefu/1systems/pnp/config.nix
index 5fbaaabc7..6c9fc0606 100644
--- a/makefu/1systems/pnp/config.nix
+++ b/makefu/1systems/pnp/config.nix
@@ -34,10 +34,11 @@
krebs.Reaktor.debug = {
debug = true;
extraEnviron = {
- REAKTOR_HOST = "ni.r";
+ # TODO: remove hard-coded server
+ REAKTOR_HOST = "irc.r";
};
plugins = with pkgs.ReaktorPlugins; [ stockholm-issue nixos-version sed-plugin ];
- channels = [ "#retiolum" ];
+ channels = [ "#xxx" ];
};
krebs.build.host = config.krebs.hosts.pnp;