finalized client configs for tor, i2pd and yggdrasil

7 files changed, 41 insertions, 30 deletions

diff --git a/os/core/core.nix b/os/core/default.nix
index 160e67b..160e67b 100644
--- a/os/core/core.nix
+++ b/os/core/default.nix
diff --git a/os/default.nix b/os/default.nix
index 225c08f..43e7476 100644
--- a/os/default.nix
+++ b/os/default.nix
@@ -1,8 +1,8 @@
 { ... }:
 {
   imports = [
-    ./core/core.nix
-    ./srv/srv.nix
-    ./wm/wm.nix
+    ./core/default.nix
+    ./srv/default.nix
+    ./wm/default.nix
   ];
 }
diff --git a/os/srv/srv.nix b/os/srv/default.nix
index 80b6296..4b5a54a 100644
--- a/os/srv/srv.nix
+++ b/os/srv/default.nix
@@ -1,21 +1,21 @@
 { ... }:
 {
   imports = [
-    ./syncthing.nix
-    ./tor.nix
-    ./sops.nix
     ./bluetooth.nix
     ./compat.nix
     ./files.nix
     ./gaming.nix
-    ./virtualization.nix
-    ./nix-helper.nix
-    ./ollama.nix
+    ./i2p.nix
     ./kdeconnect.nix
     ./monero.nix
+    ./nix-helper.nix
+    ./ollama.nix
+    ./omnisearch.nix
+    ./sops.nix
+    ./syncthing.nix
+    ./tor.nix
+    ./virtualization.nix
     ./vpn.nix
-    ./i2p.nix
     ./yggdrasil.nix
-    ./omnisearch.nix
   ];
 }
diff --git a/os/srv/i2p.nix b/os/srv/i2p.nix
index 9bf897b..74f5583 100644
--- a/os/srv/i2p.nix
+++ b/os/srv/i2p.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  username,
   ...
 }:
 let
@@ -18,11 +17,23 @@ in
     (lib.mkIf cfg.enable {
       services.i2pd = {
         enable = true;
-        bandwidth = 1024;
-        logLevel = "info";
+        enableIPv6 = true;
         upnp.enable = true;
+        bandwidth = 1024;
+        reseed.verify = true;
+        ntcp2 = {
+          enable = true;
+          # published = true;
+        };
+        ssu2 = {
+          enable = true;
+          # published = true;
+        };
+        yggdrasil = {
+          enable = true;
+          address = "200:5857:a255:4db6:8687:6928:ddc4:dad6";
+        };
         proto = {
-          i2pControl.enable = true;
           http.enable = true;
           httpProxy.enable = true;
           socksProxy = {
@@ -30,19 +41,13 @@ in
             outproxyEnable = true;
           };
           sam.enable = true;
-        };
-        yggdrasil = {
-          enable = true;
-          # address = "";
-        };
-        ssu2 = {
-          enable = true;
-          # published = true;
+          i2pControl.enable = true;
         };
       };
+      # environment.systemPackages = [ pkgs.i2pd-tools ];
     })
     (lib.mkIf cfg.enableBrowser {
-      home-manager.users.${username}.home.packages = [ pkgs.mullvad-browser ];
+      environment.systemPackages = [ pkgs.mullvad-browser ];
     })
   ];
 }
diff --git a/os/srv/tor.nix b/os/srv/tor.nix
index 08c8152..55c779d 100644
--- a/os/srv/tor.nix
+++ b/os/srv/tor.nix
@@ -17,12 +17,19 @@ in
     (lib.mkIf cfg.enable {
       services.tor = {
         enable = true;
+        client = {
+          enable = true;
+          dns.enable = true;
+          transparentProxy.enable = true;
+        };
+        settings = {
+          Sandbox = true;
+          DisableAllSwap = true;
+        };
       };
     })
     (lib.mkIf cfg.enableBrowser {
-      environment.systemPackages = with pkgs; [
-        tor-browser
-      ];
+      environment.systemPackages = [ pkgs.tor-browser ];
     })
   ];
 }
diff --git a/os/srv/yggdrasil.nix b/os/srv/yggdrasil.nix
index 7f95c00..1a18380 100644
--- a/os/srv/yggdrasil.nix
+++ b/os/srv/yggdrasil.nix
@@ -34,6 +34,7 @@ in
           ];
           Listen = [
             "tls://0.0.0.0:0"
+            "tcp://[::]:9001"
           ];
         };
       };
diff --git a/os/wm/wm.nix b/os/wm/default.nix
index a9046bb..a470171 100644
--- a/os/wm/wm.nix
+++ b/os/wm/default.nix
@@ -8,9 +8,7 @@ let
   cfg = config.os.wm;
 in
 {
-  imports = [
-    ./niri.nix
-  ];
+  imports = [ ./niri.nix ];
 
   options.os.wm.enable = lib.mkEnableOption "enables shared wm features";