cleanup

2 files changed, 17 insertions, 12 deletions

diff --git a/custom/tinc/laeradhr.nix b/custom/tinc/laeradhr.nix
index abf309f0..e66b273d 100644
--- a/custom/tinc/laeradhr.nix
+++ b/custom/tinc/laeradhr.nix
@@ -7,27 +7,31 @@
 , useDNS ? true
 }:
 
+with stdenv.lib;
 
-let
-  connectTo = if connect then "" else "ConnectTo = ymir";
-in {
+{
   "laeradhr" = {
     inherit name;
     debugLevel = 2;
     hosts = ( import ./hosts/laeradhr.nix );
-    extraConfig = connectTo;
+    extraConfig = ''
+      ${optionalString connect "ConnectTo = ymir"}
+    '';
     scripts = {
       tinc-up = ''
         #!${stdenv.shell}
         ${nettools}/bin/route add -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE metric 9999
-        ${if useDNS then ''${openresolv}/bin/resolvconf -m 0 -a tinc.laeradhr <<EOF
+        ${optionalString useDNS ''
+        ${openresolv}/bin/resolvconf -m 0 -a tinc.laeradhr <<EOF
         domain yggdrasil
         nameserver 10.141.1.1
-        EOF'' else ""}
+        EOF''}
       '';
       tinc-down = ''
         #!${stdenv.shell}
+        ${optionalString useDNS ''
         ${openresolv}/bin/resolvconf -d tinc.laeradhr
+        ''}
       '';
     };
     interfaceConfig = ipConf;
diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index 23f94a64..2e5a2442 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -7,31 +7,32 @@
 , useDNS ? true
 }:
 
+with stdenv.lib;
 
-let
-  connectTo = if connect then "ConnectTo = ymir" else "";
-in {
+{
   "yggdrasil" = {
     inherit name;
     debugLevel = 2;
     hosts = ( import ./hosts/yggdrasil.nix );
     extraConfig = ''
       PingTimeout = 10
-      ${connectTo}
+      ${optionalString connect "ConnectTo = ymir"}
     '';
     scripts = {
       tinc-up = ''
         #!${stdenv.shell}
         ${nettools}/bin/route add -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE metric 9999
-        ${if useDNS then ''
+        ${optionalString useDNS ''
         ${openresolv}/bin/resolvconf -m 0 -a tinc.yggdrasil <<EOF
         domain yggdrasil
         nameserver 10.141.1.1
-        EOF'' else ""}
+        EOF''}
       '';
       tinc-down = ''
         #!${stdenv.shell}
+        ${optionalString useDNS ''
         ${openresolv}/bin/resolvconf -d tinc.yggdrasil
+        ''}
       '';
     };
     interfaceConfig = ipConf;