summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-10-01 22:45:17 +0200
committerlassulus <lass@aidsballs.de>2015-10-01 22:45:17 +0200
commit1e410cd2329f15fc2f13c54f99eae102c09eb115 (patch)
treea9e2f4b4c6503b0208e3b5b90dd4b480995704a0 /makefu
parent406490b280c4b938259dd5689995b503f3da8721 (diff)
parentd5d3c9f8b300c507e8464d4083679f02badbd25f (diff)
Merge branch 'makefu'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/wry.nix9
-rw-r--r--makefu/2configs/base.nix2
2 files changed, 8 insertions, 3 deletions
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 29ad82d4c..b4cdab7cf 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -2,11 +2,12 @@
let
- ip = (lib.elemAt config.krebs.build.host.nets.internet.addrs4 0);
+ ip = (lib.head config.krebs.build.host.nets.internet.addrs4);
in {
imports = [
../../tv/2configs/CAC-CentOS-7-64bit.nix
../2configs/base.nix
+ ../2configs/base-sources.nix
../2configs/tinc-basic-retiolum.nix
{
}
@@ -18,13 +19,17 @@ in {
prefixLength = 24;
}
];
- networking.defaultGateway = "104.233.80.1";
+ networking.defaultGateway = "104.233.87.1";
networking.nameservers = [
"8.8.8.8"
];
# based on ../../tv/2configs/CAC-Developer-2.nix
sound.enable = false;
+
+ # prepare graphs
+ nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
+
krebs.build = {
user = config.krebs.users.makefu;
target = "root@${ip}";
diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix
index 34b413024..91a500393 100644
--- a/makefu/2configs/base.nix
+++ b/makefu/2configs/base.nix
@@ -6,7 +6,7 @@ with lib;
{
users.extraUsers =
mapAttrs (_: h: { hashedPassword = h; })
- (import /root/src/secrets/hashedPasswords.nix);
+ (import <secrets/hashedPasswords.nix>);
}
./vim.nix
];