1 files changed, 24 insertions, 17 deletions
diff --git a/modules/tor.nix b/modules/tor.nix
index 548da38..ad69f52 100644
--- a/modules/tor.nix
+++ b/modules/tor.nix
@@ -1,34 +1,41 @@
 { pkgs, ... }:
-
 {
+  networking.proxy.default = "https://127.0.0.1:8118";
   services = {
     tor = {
       enable = true;
-      
-      client = {
-        enable = true;
-        dns.enable = true;
-      };
+      # openFirewall = true;
+      torsocks.enable = true;
+      # torsocks.allowInbound = true;
+      client.enable = true;
+      # client = {
+      #   enable = true;
+      #   dns.enable = true;
+      # };
 
-      settings.DNSPort = [{
-        addr = "127.0.0.1";
-        port = 53;
-      }];
+      # settings.DNSPort = [{
+      #   addr = "127.0.0.1";
+      #   port = 53;
+      # }];
 
-      torsocks.enable = true;
+      # torsocks.enable = true;
+    };
+    privoxy = {
+      enable = true;
+      enableTor = true;
     };
-
-#    resolved = {
-#      enable = true;
-#      fallbackDns = [ "127.0.0.1:9053" ];
-#    };
   };
 
   environment.systemPackages = with pkgs; [
     tor
     torsocks
     tor-browser
+    torctl
+    vanguards
+    tractor
+    onioncircuits
+    oniux
   ];
 
-  networking.nameservers = [ "127.0.0.1" ];
+  # networking.nameservers = [ "127.0.0.1" ];
 }