9 files changed, 71 insertions, 6 deletions

diff --git a/home/ebisu/fortune/network/tools/default.nix b/home/ebisu/fortune/network/tools/default.nix
index 6b32efc..6135a82 100644
--- a/home/ebisu/fortune/network/tools/default.nix
+++ b/home/ebisu/fortune/network/tools/default.nix
@@ -21,5 +21,6 @@
     (pkgs.callPackage ../../../../../pkgs/bindtointerface.nix { })
     trayscale
     nmap
+    bandwhich
   ];
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index d6f1656..2234712 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -1,3 +1,4 @@
+{ lib, ... }:
 {
   imports = [
     ./access
@@ -23,7 +24,10 @@
     };
   };
 
-  environment.enableAllTerminfo = true;
+  environement = {
+    enableAllTerminfo = true;
+    memoryAllocator.provider = lib.mkDefault "mimalloc";
+  };
 
   console = {
     earlySetup = true;
diff --git a/modules/system/networking/tor.nix b/modules/system/networking/tor.nix
index 3e3831f..dfbfb3a 100644
--- a/modules/system/networking/tor.nix
+++ b/modules/system/networking/tor.nix
@@ -1,6 +1,27 @@
+{ pkgs, ... }:
 {
   services.tor = {
     enable = true;
-    client.enable = true;
+    torsocks.enable = true;
+
+    client = {
+      enable = true;
+      dns.enable = true;
+    };
+  };
+
+  programs.proxychains = {
+    enable = true;
+    quietMode = false;
+    proxyDNS = true;
+    package = pkgs.proxychains-ng;
+
+    proxies = {
+      tor = {
+        type = "socks5";
+        host = "127.0.0.1";
+        port = 9050;
+      };
+    };
   };
 }
diff --git a/modules/system/programs.nix b/modules/system/programs.nix
index 8a856d5..a1025fb 100644
--- a/modules/system/programs.nix
+++ b/modules/system/programs.nix
@@ -5,6 +5,7 @@
     mtr.enable = true;
     dconf.enable = true;
     ccache.enable = true;
+    fuse.userAllowOther = true;
 
     bash.interactiveShellInit = ''
       export HISTFILE="$XDG_STATE_HOME/bash/history"
diff --git a/modules/system/services/adb.nix b/modules/system/services/adb.nix
new file mode 100644
index 0000000..d106ead
--- /dev/null
+++ b/modules/system/services/adb.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  programs.adb.enable = true;
+
+  services.udev = {
+    packages = [ pkgs.android-udev-rules ];
+
+    extraRules = ''
+      SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0666", GROUP="adbusers"
+    '';
+  };
+}
diff --git a/modules/system/services/dbus.nix b/modules/system/services/dbus.nix
index d67ed2b..8b25bf9 100644
--- a/modules/system/services/dbus.nix
+++ b/modules/system/services/dbus.nix
@@ -1,11 +1,15 @@
+{ pkgs, ... }:
 {
   services.dbus = {
     enable = true;
     implementation = "broker";
 
-    # packages = [
-    #   # pkgs.flatpak
-    #   pkgs.xdg-desktop-portal
-    # ];
+    packages = with pkgs; [
+      dconf
+      gcr
+      udisks2
+      # flatpak
+      # xdg-desktop-portal
+    ];
   };
 }
diff --git a/modules/system/services/default.nix b/modules/system/services/default.nix
index 44436bd..a8292b2 100644
--- a/modules/system/services/default.nix
+++ b/modules/system/services/default.nix
@@ -1,10 +1,12 @@
 { pkgs, ... }:
 {
   imports = [
+    # ./adb.nix
     ./ananicy.nix
     ./dbus.nix
     ./libinput.nix
     ./ollama.nix
+    # ./printing.nix
     ./xserver.nix
   ];
 
diff --git a/modules/system/services/printing.nix b/modules/system/services/printing.nix
new file mode 100644
index 0000000..f7a38de
--- /dev/null
+++ b/modules/system/services/printing.nix
@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+{
+  services = {
+    printing = {
+      enable = true;
+
+      drivers = with pkgs; [
+        gutenprint
+        hplip
+      ];
+    };
+
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+  };
+}
diff --git a/statix.toml b/statix.toml
new file mode 100644
index 0000000..644696a
--- /dev/null
+++ b/statix.toml
@@ -0,0 +1 @@
+ignore = [".direnv"]