From 7278996bf80f2712537f821fffc48fdec69d8478 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 4 Nov 2015 13:40:18 +0100
Subject: tinc rewrite

---
 ymir.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'ymir.nix')

diff --git a/ymir.nix b/ymir.nix
index 0ff8ddb4..7cc5ec25 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -19,6 +19,7 @@ in {
       ./ymir-hw.nix
       ./custom/zsh.nix
       ./users.nix
+      ./custom/tinc.nix
     ];
 
   boot.loader.grub = {
@@ -143,8 +144,11 @@ in {
     chown root:shadow /etc/shadow
     chmod 0640 /etc/shadow
   '';
-  users.groups."xmpp" = {
-    members = [ "gkleen"
-              ];
-  };
+
+  services.tinc.networks = (pkgs.callPackage ./custom/yggdrasil.nix {
+    connect = false;
+    ipConf = {
+      ip4 = [ { address = "10.141.4.1"; prefixLength = 16; } ];
+    };
+    });
 }
-- 
cgit v1.2.3