From f95ed850e13e43743571d917d9f7fbc1de5037f6 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 3 Nov 2015 22:32:42 +0100
Subject: syntax poking

---
 custom/tinc/yggdrasil.nix |  2 +-
 ymir.nix                  | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index f17d9b4e..4c19e0e7 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -1,4 +1,4 @@
-{ pkgs, name, ip }:
+{ config, pkgs, name, ip }:
 
 {
   config.services.tinc = {
diff --git a/ymir.nix b/ymir.nix
index 294a458b..6f074c04 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -19,6 +19,10 @@ in {
       ./ymir-hw.nix
       ./custom/zsh.nix
       ./users.nix
+      ((import ./custom/tinc.nix) {
+        name = "ymir";
+        ip = {};
+      })
     ];
 
   boot.loader.grub = {
@@ -140,12 +144,4 @@ in {
     members = [ "gkleen"
               ];
   };
-} // ((import ./custom/tinc/yggdrasil.nix) {
-  inherit pkgs;
-  name = "ymir";
-  ip = {
-    ip4 = [
-      { address = "10.141.4.1"; prefixLength = 16; }
-    ];
-  };
-})
+}
-- 
cgit v1.2.3