51 files changed, 41 insertions, 2 deletions
diff --git a/modules/default.nix b/modules/default.nix
index c18ed49..653e176 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,10 +1,9 @@
 {
   imports = [
     ./hardware
-    ./multimedia
     ./nix
     ./security
-    ./system
+    ./software
     ./virtualisation
   ];
 }
diff --git a/modules/system/access/default.nix b/modules/software/access/default.nix
index 7db7629..7db7629 100644
--- a/modules/system/access/default.nix
+++ b/modules/software/access/default.nix
diff --git a/modules/system/access/gnupg.nix b/modules/software/access/gnupg.nix
index e60da30..e60da30 100644
--- a/modules/system/access/gnupg.nix
+++ b/modules/software/access/gnupg.nix
diff --git a/modules/system/access/mosh.nix b/modules/software/access/mosh.nix
index c9af5bf..c9af5bf 100644
--- a/modules/system/access/mosh.nix
+++ b/modules/software/access/mosh.nix
diff --git a/modules/system/access/ssh.nix b/modules/software/access/ssh.nix
index 8a2b30d..8a2b30d 100644
--- a/modules/system/access/ssh.nix
+++ b/modules/software/access/ssh.nix
diff --git a/modules/system/boot/default.nix b/modules/software/boot/default.nix
index 0798849..0798849 100644
--- a/modules/system/boot/default.nix
+++ b/modules/software/boot/default.nix
diff --git a/modules/system/boot/grub.nix b/modules/software/boot/grub.nix
index 3932713..3932713 100644
--- a/modules/system/boot/grub.nix
+++ b/modules/software/boot/grub.nix
diff --git a/modules/system/boot/systemd-boot.nix b/modules/software/boot/systemd-boot.nix
index b51a896..b51a896 100644
--- a/modules/system/boot/systemd-boot.nix
+++ b/modules/software/boot/systemd-boot.nix
diff --git a/modules/system/default.nix b/modules/software/default.nix
index 7b9013b..4239899 100644
--- a/modules/system/default.nix
+++ b/modules/software/default.nix
@@ -4,6 +4,7 @@
     ./access
     ./boot
     ./desktop
+    ./multimedia
     ./networking
     ./services
     ./encryption.nix
diff --git a/modules/system/desktop/default.nix b/modules/software/desktop/default.nix
index bd2c811..bd2c811 100644
--- a/modules/system/desktop/default.nix
+++ b/modules/software/desktop/default.nix
diff --git a/modules/system/desktop/gtk.nix b/modules/software/desktop/gtk.nix
index 4357e75..4357e75 100644
--- a/modules/system/desktop/gtk.nix
+++ b/modules/software/desktop/gtk.nix
diff --git a/modules/system/desktop/xdg-portal.nix b/modules/software/desktop/xdg-portal.nix
index 72bcb97..72bcb97 100644
--- a/modules/system/desktop/xdg-portal.nix
+++ b/modules/software/desktop/xdg-portal.nix
diff --git a/modules/system/encryption.nix b/modules/software/encryption.nix
index 53a24bb..53a24bb 100644
--- a/modules/system/encryption.nix
+++ b/modules/software/encryption.nix
diff --git a/modules/system/gaming.nix b/modules/software/gaming.nix
index 790a94e..790a94e 100644
--- a/modules/system/gaming.nix
+++ b/modules/software/gaming.nix
diff --git a/modules/system/input.nix b/modules/software/input.nix
index e9f3c45..e9f3c45 100644
--- a/modules/system/input.nix
+++ b/modules/software/input.nix
diff --git a/modules/system/locale.nix b/modules/software/locale.nix
index 2648b82..2648b82 100644
--- a/modules/system/locale.nix
+++ b/modules/software/locale.nix
diff --git a/modules/multimedia/audio/default.nix b/modules/software/multimedia/audio/default.nix
index f4e7f0a..f4e7f0a 100644
--- a/modules/multimedia/audio/default.nix
+++ b/modules/software/multimedia/audio/default.nix
diff --git a/modules/multimedia/audio/pipewire.nix b/modules/software/multimedia/audio/pipewire.nix
index 2824176..2824176 100644
--- a/modules/multimedia/audio/pipewire.nix
+++ b/modules/software/multimedia/audio/pipewire.nix
diff --git a/modules/multimedia/audio/wireplumber.nix b/modules/software/multimedia/audio/wireplumber.nix
index 970396f..970396f 100644
--- a/modules/multimedia/audio/wireplumber.nix
+++ b/modules/software/multimedia/audio/wireplumber.nix
diff --git a/modules/multimedia/default.nix b/modules/software/multimedia/default.nix
index 7bf261a..7bf261a 100644
--- a/modules/multimedia/default.nix
+++ b/modules/software/multimedia/default.nix
diff --git a/modules/multimedia/video/default.nix b/modules/software/multimedia/video/default.nix
index 31cdfd5..31cdfd5 100644
--- a/modules/multimedia/video/default.nix
+++ b/modules/software/multimedia/video/default.nix
diff --git a/modules/multimedia/video/graphics.nix b/modules/software/multimedia/video/graphics.nix
index 13da295..13da295 100644
--- a/modules/multimedia/video/graphics.nix
+++ b/modules/software/multimedia/video/graphics.nix
diff --git a/modules/multimedia/video/libva.nix b/modules/software/multimedia/video/libva.nix
index d420495..d420495 100644
--- a/modules/multimedia/video/libva.nix
+++ b/modules/software/multimedia/video/libva.nix
diff --git a/modules/multimedia/video/nvidia.nix b/modules/software/multimedia/video/nvidia.nix
index bc8cb22..bc8cb22 100644
--- a/modules/multimedia/video/nvidia.nix
+++ b/modules/software/multimedia/video/nvidia.nix
diff --git a/modules/multimedia/video/vulkan.nix b/modules/software/multimedia/video/vulkan.nix
index be37e0e..be37e0e 100644
--- a/modules/multimedia/video/vulkan.nix
+++ b/modules/software/multimedia/video/vulkan.nix
diff --git a/modules/system/networking/default.nix b/modules/software/networking/default.nix
index ddc8d10..724693d 100644
--- a/modules/system/networking/default.nix
+++ b/modules/software/networking/default.nix
@@ -4,6 +4,7 @@
     ./firewall
     ./vpn
     ./dhcpcd.nix
+    ./i2p.nix
     ./ipv6.nix
     ./loopback.nix
     ./networkmanager.nix
diff --git a/modules/system/networking/dhcpcd.nix b/modules/software/networking/dhcpcd.nix
index f46b657..f46b657 100644
--- a/modules/system/networking/dhcpcd.nix
+++ b/modules/software/networking/dhcpcd.nix
diff --git a/modules/system/networking/firewall/default.nix b/modules/software/networking/firewall/default.nix
index 074f398..074f398 100644
--- a/modules/system/networking/firewall/default.nix
+++ b/modules/software/networking/firewall/default.nix
diff --git a/modules/system/networking/firewall/fail2ban.nix b/modules/software/networking/firewall/fail2ban.nix
index 6311b14..6311b14 100644
--- a/modules/system/networking/firewall/fail2ban.nix
+++ b/modules/software/networking/firewall/fail2ban.nix
diff --git a/modules/software/networking/i2p.nix b/modules/software/networking/i2p.nix
new file mode 100644
index 0000000..19077ba
--- /dev/null
+++ b/modules/software/networking/i2p.nix
@@ -0,0 +1,38 @@
+{
+  # https://voidcruiser.nl/rambles/i2p-on-nixos/
+  containers.i2pd = {
+    autoStart = true;
+
+    config = {
+      system.stateVersion = "24.05";
+
+      networking.firewall.allowedTCPPorts = [
+        7656
+        7070
+        4447
+        4444
+      ];
+
+      services.i2pd = {
+        enable = true;
+        address = "0.0.0.0";
+
+        proto = {
+          http.enable = true;
+          socksProxy.enable = true;
+          httpProxy.enable = true;
+          sam.enable = true;
+          i2cp.enable = true;
+        };
+
+        addressbook.subscriptions = [
+          "http://inr.i2p/export/alive-hosts.txt"
+          "http://i2p-projekt.i2p/hosts.txt"
+          "http://stats.i2p/cgi-bin/newhosts.txt"
+          "http://reg.i2p/export/hosts.txt"
+          "http://notbob.i2p/hosts.txt"
+        ];
+      };
+    };
+  };
+}
diff --git a/modules/system/networking/ipv6.nix b/modules/software/networking/ipv6.nix
index 274c1ae..274c1ae 100644
--- a/modules/system/networking/ipv6.nix
+++ b/modules/software/networking/ipv6.nix
diff --git a/modules/system/networking/loopback.nix b/modules/software/networking/loopback.nix
index 62e745e..62e745e 100644
--- a/modules/system/networking/loopback.nix
+++ b/modules/software/networking/loopback.nix
diff --git a/modules/system/networking/networkmanager.nix b/modules/software/networking/networkmanager.nix
index 8672759..8672759 100644
--- a/modules/system/networking/networkmanager.nix
+++ b/modules/software/networking/networkmanager.nix
diff --git a/modules/system/networking/optimise.nix b/modules/software/networking/optimise.nix
index c6f2bec..c6f2bec 100644
--- a/modules/system/networking/optimise.nix
+++ b/modules/software/networking/optimise.nix
diff --git a/modules/system/networking/resolved.nix b/modules/software/networking/resolved.nix
index 82effbe..82effbe 100644
--- a/modules/system/networking/resolved.nix
+++ b/modules/software/networking/resolved.nix
diff --git a/modules/system/networking/tor.nix b/modules/software/networking/tor.nix
index dfbfb3a..dfbfb3a 100644
--- a/modules/system/networking/tor.nix
+++ b/modules/software/networking/tor.nix
diff --git a/modules/system/networking/vpn/default.nix b/modules/software/networking/vpn/default.nix
index 92a11b0..92a11b0 100644
--- a/modules/system/networking/vpn/default.nix
+++ b/modules/software/networking/vpn/default.nix
diff --git a/modules/system/networking/vpn/pia.nix b/modules/software/networking/vpn/pia.nix
index d52dbf8..d52dbf8 100644
--- a/modules/system/networking/vpn/pia.nix
+++ b/modules/software/networking/vpn/pia.nix
diff --git a/modules/system/networking/vpn/tailscale.nix b/modules/software/networking/vpn/tailscale.nix
index 21f471a..21f471a 100644
--- a/modules/system/networking/vpn/tailscale.nix
+++ b/modules/software/networking/vpn/tailscale.nix
diff --git a/modules/system/programs.nix b/modules/software/programs.nix
index a1025fb..a1025fb 100644
--- a/modules/system/programs.nix
+++ b/modules/software/programs.nix
diff --git a/modules/system/services/adb.nix b/modules/software/services/adb.nix
index d106ead..d106ead 100644
--- a/modules/system/services/adb.nix
+++ b/modules/software/services/adb.nix
diff --git a/modules/system/services/ananicy.nix b/modules/software/services/ananicy.nix
index bdc9bbd..bdc9bbd 100644
--- a/modules/system/services/ananicy.nix
+++ b/modules/software/services/ananicy.nix
diff --git a/modules/system/services/dbus.nix b/modules/software/services/dbus.nix
index 8b25bf9..8b25bf9 100644
--- a/modules/system/services/dbus.nix
+++ b/modules/software/services/dbus.nix
diff --git a/modules/system/services/default.nix b/modules/software/services/default.nix
index f126f62..f126f62 100644
--- a/modules/system/services/default.nix
+++ b/modules/software/services/default.nix
diff --git a/modules/system/services/libinput.nix b/modules/software/services/libinput.nix
index 643f814..643f814 100644
--- a/modules/system/services/libinput.nix
+++ b/modules/software/services/libinput.nix
diff --git a/modules/system/services/ollama.nix b/modules/software/services/ollama.nix
index d737250..d737250 100644
--- a/modules/system/services/ollama.nix
+++ b/modules/software/services/ollama.nix
diff --git a/modules/system/services/printing.nix b/modules/software/services/printing.nix
index f7a38de..f7a38de 100644
--- a/modules/system/services/printing.nix
+++ b/modules/software/services/printing.nix
diff --git a/modules/system/services/xserver.nix b/modules/software/services/xserver.nix
index e08ac04..e08ac04 100644
--- a/modules/system/services/xserver.nix
+++ b/modules/software/services/xserver.nix
diff --git a/modules/system/systemd.nix b/modules/software/systemd.nix
index 9ecb5b2..9ecb5b2 100644
--- a/modules/system/systemd.nix
+++ b/modules/software/systemd.nix
diff --git a/modules/system/users.nix b/modules/software/users.nix
index 4055353..4055353 100644
--- a/modules/system/users.nix
+++ b/modules/software/users.nix
diff --git a/modules/system/variables.nix b/modules/software/variables.nix
index 7e9b794..7e9b794 100644
--- a/modules/system/variables.nix
+++ b/modules/software/variables.nix