From 654f707059b015367e2b35c4dbadb840ed34038a Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Tue, 16 Mar 2021 21:34:46 +0300
Subject: [PATCH] Add wireguard

---
 modules/network.nix | 37 +++++++++++++++++++++++++++++++++----
 modules/secrets.nix |  4 ++--
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/modules/network.nix b/modules/network.nix
index c1943ee..763ee95 100644
--- a/modules/network.nix
+++ b/modules/network.nix
@@ -1,14 +1,16 @@
 { pkgs, lib, config, ... }:
 let
-  localRanges = [
-    { from = 1714; to = 1764; } # KDE connect
-  ];
+  localRanges = [{
+    from = 1714;
+    to = 1764;
+  } # KDE connect
+    ];
 in {
   networking = {
     networkmanager.enable = true;
     firewall = {
       enable = true;
-      allowedTCPPorts = [ 13748 13722 5000 22 80 443 ];
+      allowedTCPPorts = [ 13748 13722 5000 22 80 443 51820 ];
       interfaces.wlan0.allowedTCPPortRanges = localRanges;
       interfaces.wlan0.allowedUDPPortRanges = localRanges;
       interfaces.eth0.allowedUDPPortRanges = localRanges;
@@ -25,4 +27,31 @@ in {
   networking.firewall.trustedInterfaces = [ "eth0" ];
   systemd.services.ModemManager.wantedBy =
     lib.optional (config.device == "T490s-Laptop") "network.target";
+
+  secrets.wireguard-serokell = { };
+
+  networking.wireguard.interfaces.serokell = {
+    listenPort = 51820;
+    ips = [
+      "172.20.0.52/32"
+      # "fd73:7272:ed50::52/128"
+    ];
+    privateKeyFile = config.secrets.wireguard-serokell.decrypted;
+    peers = [{
+      allowedIPs = [
+        "0.0.0.0/0"
+        # "::/0"
+      ];
+      # endpoint = "serokell.net:35944";
+      endpoint = "147.75.100.17:35944";
+      publicKey = "sgLUARawWJejANs2CwuCptwJO55c4jkmnP0L14FNCyw=";
+      persistentKeepalive = 24;
+    }];
+  };
+
+  # restart when the service fails to resolve DNS
+  systemd.services.wireguard-serokell.serviceConfig = {
+    Restart = "on-failure";
+    RestartSec = "30s";
+  };
 }
diff --git a/modules/secrets.nix b/modules/secrets.nix
index af162ad..e25805d 100755
--- a/modules/secrets.nix
+++ b/modules/secrets.nix
@@ -35,7 +35,7 @@ let
       };
       services = mkOption {
         type = listOf str;
-        default = [ "${name}.service" ];
+        default = [ "${name}" ];
       };
       __toString = mkOption {
         readOnly = true;
@@ -87,7 +87,7 @@ let
   addDependencies = name: cfg:
     with cfg;
     genAttrs services (service: rec {
-      requires = [ "${name}-secrets" ];
+      requires = [ "${name}-secrets.service" ];
       after = requires;
       bindsTo = requires;
     });