From 5e8b1f37c6b7981e595f059a1d694f21849ba50e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Mon, 20 Mar 2023 13:14:02 +0100
Subject: [PATCH] feat(radio): move to ful to evade block, remove tor

---
 configs/tor.nix                    |  3 ++-
 flake.nix                          |  1 +
 systems/ful/configuration.nix      | 15 +++++++++++++++
 systems/{makanek => ful}/radio.nix |  2 +-
 systems/makanek/configuration.nix  |  1 -
 5 files changed, 19 insertions(+), 3 deletions(-)
 rename systems/{makanek => ful}/radio.nix (96%)

diff --git a/configs/tor.nix b/configs/tor.nix
index 152f268..0ccbfcb 100644
--- a/configs/tor.nix
+++ b/configs/tor.nix
@@ -1,4 +1,5 @@
 {pkgs, ...}: {
   services.tor.enable = true;
-  environment.systemPackages = [pkgs.tor];
+  services.tor.client.enable = true;
+  environment.systemPackages = [pkgs.tor pkgs.torsocks];
 }
diff --git a/flake.nix b/flake.nix
index 7ac49f0..576a6bc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -74,6 +74,7 @@
             }
             systems/ful/configuration.nix
             agenix.nixosModules.default
+            inputs.self.nixosModules.passport
             retiolum.nixosModules.retiolum
           ];
         };
diff --git a/systems/ful/configuration.nix b/systems/ful/configuration.nix
index 89ec3af..33358fd 100644
--- a/systems/ful/configuration.nix
+++ b/systems/ful/configuration.nix
@@ -9,6 +9,7 @@ in {
   imports = [
     ./hardware-configuration.nix
     ./matomo.nix
+    ./radio.nix
     ../../configs/monitoring.nix
     ../../configs/save-space.nix
     ../../configs/spacetime.nix
@@ -17,6 +18,20 @@ in {
     ../../configs/nix.nix
   ];
 
+  niveum.passport = {
+    enable = true;
+    introductionHTML = ''
+    '';
+    virtualHost = "ful.r";
+
+    services = [
+      {
+        title = "restic backup";
+        description = "This machine backups its state via restic backup.";
+      }
+    ];
+  };
+
   age.secrets = {
     retiolum-rsa = {
       file = ../../secrets/ful-retiolum-privateKey-rsa.age;
diff --git a/systems/makanek/radio.nix b/systems/ful/radio.nix
similarity index 96%
rename from systems/makanek/radio.nix
rename to systems/ful/radio.nix
index 772906f..14e5395 100644
--- a/systems/makanek/radio.nix
+++ b/systems/ful/radio.nix
@@ -17,7 +17,7 @@
     }
 
     lyrikline=https://www.lyrikline.org
-    random_route="$(${pkgs.tor}/bin/torify ${pkgs.curl}/bin/curl -sSL "$lyrikline/index.php/tools/getrandompoem" --data-raw 'lang=de' --compressed | ${pkgs.jq}/bin/jq -r .link)"
+    random_route="$(${pkgs.curl}/bin/curl -sSL "$lyrikline/index.php/tools/getrandompoem" --data-raw 'lang=de' --compressed | ${pkgs.jq}/bin/jq -r .link)"
     poem_url="$lyrikline$random_route"
 
     ${pkgs.curl}/bin/curl -sSL "$poem_url" > "$html"
diff --git a/systems/makanek/configuration.nix b/systems/makanek/configuration.nix
index ffe70cc..321526a 100644
--- a/systems/makanek/configuration.nix
+++ b/systems/makanek/configuration.nix
@@ -16,7 +16,6 @@ in {
     ./names.nix
     ./nextcloud.nix
     ./radio-news.nix
-    ./radio.nix
     ./retiolum-map.nix
     ./tarot.nix
     ./tt-rss.nix