From 89ce2f5be474b3e72b53e450054f94fd4d13e381 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 23 Jul 2015 00:37:21 +0200
Subject: * tv identity: define type harder

---
 1systems/tv/cd.nix    | 7 ++-----
 1systems/tv/mkdir.nix | 7 ++-----
 1systems/tv/nomic.nix | 7 ++-----
 1systems/tv/rmdir.nix | 7 ++-----
 1systems/tv/wu.nix    | 7 ++-----
 5 files changed, 10 insertions(+), 25 deletions(-)

(limited to '1systems')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index 42e4ecf..d3cae6f 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -35,11 +35,8 @@ in
         singleton config.tv.github-hosts-sync.port;
     }
     {
-      imports = [ ../../3modules/tv/identity.nix ];
-      tv.identity = {
-        enable = true;
-        self = config.tv.identity.hosts.cd;
-      };
+      imports = [ ../../2configs/tv/identity.nix ];
+      tv.identity.self = config.tv.identity.hosts.cd;
     }
     {
       imports = [ ../../3modules/tv/iptables.nix ];
diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix
index e4e8987..2e90c8a 100644
--- a/1systems/tv/mkdir.nix
+++ b/1systems/tv/mkdir.nix
@@ -11,11 +11,8 @@ with lib;
     ../../2configs/tv/exim-smarthost.nix
     ../../2configs/tv/git-public.nix
     {
-      imports = [ ../../3modules/tv/identity.nix ];
-      tv.identity = {
-        enable = true;
-        self = config.tv.identity.hosts.mkdir;
-      };
+      imports = [ ../../2configs/tv/identity.nix ];
+      tv.identity.self = config.tv.identity.hosts.mkdir;
     }
     {
       imports = [ ../../3modules/tv/iptables.nix ];
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index b623529..6f984c4 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -10,11 +10,8 @@ with lib;
     ../../2configs/tv/exim-retiolum.nix
     ../../2configs/tv/git-public.nix
     {
-      imports = [ ../../3modules/tv/identity.nix ];
-      tv.identity = {
-        enable = true;
-        self = config.tv.identity.hosts.nomic;
-      };
+      imports = [ ../../2configs/tv/identity.nix ];
+      tv.identity.self = config.tv.identity.hosts.nomic;
     }
     {
       imports = [ ../../3modules/tv/iptables.nix ];
diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix
index 14817c9..b77a1c3 100644
--- a/1systems/tv/rmdir.nix
+++ b/1systems/tv/rmdir.nix
@@ -11,11 +11,8 @@ with lib;
     ../../2configs/tv/exim-smarthost.nix
     ../../2configs/tv/git-public.nix
     {
-      imports = [ ../../3modules/tv/identity.nix ];
-      tv.identity = {
-        enable = true;
-        self = config.tv.identity.hosts.rmdir;
-      };
+      imports = [ ../../2configs/tv/identity.nix ];
+      tv.identity.self = config.tv.identity.hosts.rmdir;
     }
     {
       imports = [ ../../3modules/tv/iptables.nix ];
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 8663866..400005c 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -18,11 +18,8 @@ in
     ../../2configs/tv/xserver.nix
     ../../2configs/tv/synaptics.nix # TODO w110er if xserver is enabled
     {
-      imports = [ ../../3modules/tv/identity.nix ];
-      tv.identity = {
-        enable = true;
-        self = config.tv.identity.hosts.wu;
-      };
+      imports = [ ../../2configs/tv/identity.nix ];
+      tv.identity.self = config.tv.identity.hosts.wu;
     }
     {
       environment.systemPackages = with pkgs; [
-- 
cgit v1.2.3


From 039f3193b75e78cc133409b69fb9784ce001ad57 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 23 Jul 2015 01:56:46 +0200
Subject: 4 tv: generate tinc config

---
 1systems/tv/mkdir.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '1systems')

diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix
index 2e90c8a..e0e057d 100644
--- a/1systems/tv/mkdir.nix
+++ b/1systems/tv/mkdir.nix
@@ -46,7 +46,7 @@ with lib;
   networking.hostName = "mkdir";
   networking.interfaces.enp2s1.ip4 = [
     {
-      address = "162.248.167.241";
+      address = "162.248.167.241"; # TODO
       prefixLength = 24;
     }
   ];
-- 
cgit v1.2.3