From 6a73ace61fe95a74609b210ace27e1f07026dfab Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Fri, 28 May 2021 18:24:33 +0200
Subject: dnscrypt: move to usecases/common

---
 usecases/common/dnscrypt.nix             | 47 ++++++++++++++++++++++++++++++++
 usecases/desktop/default.nix             |  2 +-
 usecases/desktop/networking/dnscrypt.nix | 47 --------------------------------
 3 files changed, 48 insertions(+), 48 deletions(-)
 create mode 100644 usecases/common/dnscrypt.nix
 delete mode 100644 usecases/desktop/networking/dnscrypt.nix

(limited to 'usecases')

diff --git a/usecases/common/dnscrypt.nix b/usecases/common/dnscrypt.nix
new file mode 100644
index 0000000..fbeb61f
--- /dev/null
+++ b/usecases/common/dnscrypt.nix
@@ -0,0 +1,47 @@
+inputs:
+
+{ config, lib, ... }:
+
+{
+  services.dnscrypt-proxy2 = {
+    enable = true;
+    settings = {
+      static = {
+        "ns3.fr.dns.opennic.glue iriseden DNSCrypt IPv4".stamp =
+          "sdns://AQcAAAAAAAAAEzYyLjIxMC4xNzcuMTg5OjEwNTMgW8vytBGk6u3kvCpl4q88XjqW-w6JJiJ7QBObcFV7gYAfMi5kbnNjcnlwdC1jZXJ0Lm5zMS5pcmlzZWRlbi5mcg";
+        "ns3.fr.dns.opennic.glue iriseden DNSCrypt IPv6".stamp =
+          "sdns://AQcAAAAAAAAAHVsyMDAxOmJjODozMmQ3OjMwODo6MjAxXToxMDUzIEUAcwKTPY6tyEQxtfO3rIzEyqN9w7WGPLz7ZsHsx5EGHzIuZG5zY3J5cHQtY2VydC5uczEuaXJpc2VkZW4uZnI";
+        "ns3.fr.dns.opennic.glue iriseden DoH".stamp =
+          "sdns://AgcAAAAAAAAAAAAPbnMxLmlyaXNlZGVuLmV1CWRucy1xdWVyeQ";
+
+        "ns4.fr.dns.opennic.glue iriseden DNSCrypt IPv4".stamp =
+          "sdns://AQcAAAAAAAAAEjYyLjIxMC4xODAuNzE6MTA1MyBxLWt8kNHoMqM7vKXCkuZ3PnB32c0qV2I3KGQYtlDKSB8yLmRuc2NyeXB0LWNlcnQubnMyLmlyaXNlZGVuLmZy";
+        "ns4.fr.dns.opennic.glue iriseden DNSCrypt IPv6".stamp =
+          "sdns://AQcAAAAAAAAAHVsyMDAxOmJjODozMmQ3OjMwNzo6MzAxXToxMDUzIJjeEela3WTzMuuZTskr7aOchIg2llSDNRsHfcggITn6HzIuZG5zY3J5cHQtY2VydC5uczIuaXJpc2VkZW4uZnI";
+        "ns4.fr.dns.opennic.glue iriseden DoH".stamp =
+          "sdns://AgcAAAAAAAAAAAAPbnMyLmlyaXNlZGVuLmV1CWRucy1xdWVyeQ";
+
+        "ns8.he.de.dns.opennic.glue ethservices DoH".stamp =
+          "sdns://AgcAAAAAAAAAAAAcb3Blbm5pYzEuZXRoLXNlcnZpY2VzLmRlOjg1MwA";
+
+        "ns31.de.dns.opennic.glue ethservices DoH".stamp =
+          "sdns://AgcAAAAAAAAAAAAcb3Blbm5pYzIuZXRoLXNlcnZpY2VzLmRlOjg1MwA";
+
+        "ns3.de.dns.opennic.glue Eleix DoH".stamp =
+          "sdns://AgcAAAAAAAAAAAAQZG9oLmJvb3RobGFicy5tZQlkbnMtcXVlcnk";
+      };
+
+      cloaking_rules = with lib;
+        let
+          inherit (config.networking) hosts;
+          entryToCloak = addr:
+            concatMapStringsSep "\n" (hostname: "${hostname} ${addr}") hosts.${addr};
+        in
+        builtins.toFile
+          "cloaking-rules.txt"
+          (concatMapStringsSep "\n" entryToCloak (attrNames config.networking.hosts));
+    };
+  };
+
+  networking.resolvconf.useLocalResolver = true;
+}
diff --git a/usecases/desktop/default.nix b/usecases/desktop/default.nix
index 3be719a..ea87de2 100644
--- a/usecases/desktop/default.nix
+++ b/usecases/desktop/default.nix
@@ -8,6 +8,6 @@ inputs:
   imports = [
     (import ./graphical.nix inputs)
     (import ./pipewire.nix inputs)
-    (import ./networking/dnscrypt.nix inputs)
+    (import ../common/dnscrypt.nix inputs)
   ];
 }
diff --git a/usecases/desktop/networking/dnscrypt.nix b/usecases/desktop/networking/dnscrypt.nix
deleted file mode 100644
index fbeb61f..0000000
--- a/usecases/desktop/networking/dnscrypt.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-inputs:
-
-{ config, lib, ... }:
-
-{
-  services.dnscrypt-proxy2 = {
-    enable = true;
-    settings = {
-      static = {
-        "ns3.fr.dns.opennic.glue iriseden DNSCrypt IPv4".stamp =
-          "sdns://AQcAAAAAAAAAEzYyLjIxMC4xNzcuMTg5OjEwNTMgW8vytBGk6u3kvCpl4q88XjqW-w6JJiJ7QBObcFV7gYAfMi5kbnNjcnlwdC1jZXJ0Lm5zMS5pcmlzZWRlbi5mcg";
-        "ns3.fr.dns.opennic.glue iriseden DNSCrypt IPv6".stamp =
-          "sdns://AQcAAAAAAAAAHVsyMDAxOmJjODozMmQ3OjMwODo6MjAxXToxMDUzIEUAcwKTPY6tyEQxtfO3rIzEyqN9w7WGPLz7ZsHsx5EGHzIuZG5zY3J5cHQtY2VydC5uczEuaXJpc2VkZW4uZnI";
-        "ns3.fr.dns.opennic.glue iriseden DoH".stamp =
-          "sdns://AgcAAAAAAAAAAAAPbnMxLmlyaXNlZGVuLmV1CWRucy1xdWVyeQ";
-
-        "ns4.fr.dns.opennic.glue iriseden DNSCrypt IPv4".stamp =
-          "sdns://AQcAAAAAAAAAEjYyLjIxMC4xODAuNzE6MTA1MyBxLWt8kNHoMqM7vKXCkuZ3PnB32c0qV2I3KGQYtlDKSB8yLmRuc2NyeXB0LWNlcnQubnMyLmlyaXNlZGVuLmZy";
-        "ns4.fr.dns.opennic.glue iriseden DNSCrypt IPv6".stamp =
-          "sdns://AQcAAAAAAAAAHVsyMDAxOmJjODozMmQ3OjMwNzo6MzAxXToxMDUzIJjeEela3WTzMuuZTskr7aOchIg2llSDNRsHfcggITn6HzIuZG5zY3J5cHQtY2VydC5uczIuaXJpc2VkZW4uZnI";
-        "ns4.fr.dns.opennic.glue iriseden DoH".stamp =
-          "sdns://AgcAAAAAAAAAAAAPbnMyLmlyaXNlZGVuLmV1CWRucy1xdWVyeQ";
-
-        "ns8.he.de.dns.opennic.glue ethservices DoH".stamp =
-          "sdns://AgcAAAAAAAAAAAAcb3Blbm5pYzEuZXRoLXNlcnZpY2VzLmRlOjg1MwA";
-
-        "ns31.de.dns.opennic.glue ethservices DoH".stamp =
-          "sdns://AgcAAAAAAAAAAAAcb3Blbm5pYzIuZXRoLXNlcnZpY2VzLmRlOjg1MwA";
-
-        "ns3.de.dns.opennic.glue Eleix DoH".stamp =
-          "sdns://AgcAAAAAAAAAAAAQZG9oLmJvb3RobGFicy5tZQlkbnMtcXVlcnk";
-      };
-
-      cloaking_rules = with lib;
-        let
-          inherit (config.networking) hosts;
-          entryToCloak = addr:
-            concatMapStringsSep "\n" (hostname: "${hostname} ${addr}") hosts.${addr};
-        in
-        builtins.toFile
-          "cloaking-rules.txt"
-          (concatMapStringsSep "\n" entryToCloak (attrNames config.networking.hosts));
-    };
-  };
-
-  networking.resolvconf.useLocalResolver = true;
-}
-- 
cgit v1.2.3