finalized client configs for tor, i2pd and yggdrasil

23 files changed, 199 insertions, 279 deletions

diff --git a/.sops.yaml b/.sops.yaml
index b73f940..6cfa6ce 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -3,7 +3,6 @@ keys:
   - &host_szpont age1s39d4mdrjhkf8cy8eea02p836r7s875fj8f7w3z4ld2stmaac49qd075ww
   - &host_thinkpad age12htxy05mlkaqx7q6m5wufkqnnvhmhe4nfsr5ljlwkdk0u59f7ujq7537fw
   - &host_pendrive age1sx8ut0arwlrp7n7qvlaele8mq93pyvzc0ddetlk47cnyx935gcusdceq9q
-  - &host_laptop age1m4u7n6mt5d3jv39lf4aedr9gqu3khl4sahuqx5n5h7v48gkyc9zqkp9qs8
 
 creation_rules:
   - path_regex: ^secrets\.yaml$
@@ -13,4 +12,3 @@ creation_rules:
           - *host_szpont
           - *host_thinkpad
           - *host_pendrive
-          - *host_laptop
diff --git a/flake.lock b/flake.lock
index bba0daa..8479dbd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -212,11 +212,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
         "type": "github"
       },
       "original": {
@@ -363,11 +363,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774647953,
-        "narHash": "sha256-f0u5YpobYpm6LsmInRFYbc+gI0NJG9WcMzSmlkhdzs8=",
+        "lastModified": 1775711780,
+        "narHash": "sha256-7Bo5/DAh6DSA9N+P2dg+LvSL/ArQuvkObNPyyGBqDO0=",
         "owner": "Mjoyufull",
         "repo": "fsel",
-        "rev": "c7c7a3f4dfbe06e2facdb6b6ed11002286717308",
+        "rev": "d7ce3cf6e74e165d333fc1ec0245ecfaca149af8",
         "type": "github"
       },
       "original": {
@@ -383,11 +383,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775622785,
-        "narHash": "sha256-/yFxO+7oS1SymDfJ2iVO7K5vJKcYfe9XGIJ+quLqz0Q=",
+        "lastModified": 1776015217,
+        "narHash": "sha256-PUb9TTfqsA1g+aHJt5s8tIP7QdX8xHeOtDMPVRuylfM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "527e47b78fe67213072f706bf933a9705a8c4974",
+        "rev": "f6196e5b4d3f0168d09feab9ba678fa18ca58cbb",
         "type": "github"
       },
       "original": {
@@ -691,11 +691,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775628196,
-        "narHash": "sha256-C9H4CHXo/yMEiYYi2BcUwCreCOqsF1DaMR2gimduPNE=",
+        "lastModified": 1775952282,
+        "narHash": "sha256-iJcGy0pW0wX7q6HAQuKx8sskTyu8an0l0gI3TBgzk3E=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "79ca5eedb2f68e2681eba7523acd43a12c3225d1",
+        "rev": "f719e136a8e0cd91e70515e590385356abce1341",
         "type": "github"
       },
       "original": {
@@ -707,11 +707,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1775605133,
-        "narHash": "sha256-QBi9quAM8C1ja7pu/lOZPkOP57/sbjA5Q+JJ/yNR81o=",
+        "lastModified": 1775949028,
+        "narHash": "sha256-JXrr9lxKfTIm/VW4jvaB1RU9r+7pAoaXeDsy24TGPiw=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "de674491800c0ecb6f6658512829a3d21c47fe5f",
+        "rev": "4a289bfce3e71bf00d1eced168a6a7bbb270b95b",
         "type": "github"
       },
       "original": {
@@ -732,11 +732,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1775637310,
-        "narHash": "sha256-LYm11N3gAH8bnQcU+/bIyeE1YAFOUuaJ5LQQgI1VB3E=",
+        "lastModified": 1775877135,
+        "narHash": "sha256-nAqtUMy22olwyiOJB0CASVrbu5XB5+43GjlbIJ1KuvQ=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "15223527082d596609717cacf10a8b2d51c8787d",
+        "rev": "f943da038fd668d435c2d17916577f295faa8839",
         "type": "github"
       },
       "original": {
@@ -786,11 +786,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775632307,
-        "narHash": "sha256-zT06wZQL4f0p60l4OjBqE4gnU7zd+CHU01GLrOanTzQ=",
+        "lastModified": 1775801806,
+        "narHash": "sha256-aTSAGoSF58PXhsC6DlFI6rZo8IlOOtzt+N4oFaMtEOA=",
         "owner": "powerofthe69",
         "repo": "nix-gaming-edge",
-        "rev": "83a6eea6181f7848ceeac0b65fee89200233a703",
+        "rev": "78a955bd30cf9c960442703cf431ba7cfa12f316",
         "type": "github"
       },
       "original": {
@@ -848,11 +848,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1775525138,
-        "narHash": "sha256-BQb70+B378ECLO8iQT3P/b1hCC5/CJVHZdeulY8futc=",
+        "lastModified": 1775811116,
+        "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d96b37bbeb9840f1c0ebfe90585ef5067b69bbb3",
+        "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
         "type": "github"
       },
       "original": {
@@ -864,11 +864,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1775525138,
-        "narHash": "sha256-BQb70+B378ECLO8iQT3P/b1hCC5/CJVHZdeulY8futc=",
+        "lastModified": 1775811116,
+        "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d96b37bbeb9840f1c0ebfe90585ef5067b69bbb3",
+        "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
         "type": "github"
       },
       "original": {
@@ -880,11 +880,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1775423009,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "lastModified": 1775710090,
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {
@@ -919,11 +919,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1775307257,
-        "narHash": "sha256-y9hEecHH4ennFwIcw1n480YCGh73DkEmizmQnyXuvgg=",
+        "lastModified": 1775988703,
+        "narHash": "sha256-gqIk6zAIJ0otdoWWjHeE51ed8ZlCkv4Yz5YD0+JfCl0=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "2e008bb941f72379d5b935d5bfe70ed8b7c793ff",
+        "rev": "05a8ad9f006936bf451043afb80821c204264a48",
         "type": "github"
       },
       "original": {
@@ -944,11 +944,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1775567832,
-        "narHash": "sha256-jAnxLY0qPW+qR4f5GTLp2qbtku8b4E2XuJ8mavSIPfY=",
+        "lastModified": 1775892726,
+        "narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=",
         "owner": "NotAShelf",
         "repo": "nvf",
-        "rev": "d6746a7510ba15e9a3577322a2e5387ab983f970",
+        "rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436",
         "type": "github"
       },
       "original": {
@@ -1060,6 +1060,7 @@
         "satty": "satty",
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix",
+        "subtui": "subtui",
         "waybar": "waybar",
         "yazi": "yazi"
       }
@@ -1188,11 +1189,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775619836,
-        "narHash": "sha256-VcC/+MMMldwQKcST2y/QTndGLusSxjeUvYwFwzZKKko=",
+        "lastModified": 1775971308,
+        "narHash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "de5f2d596eb896a5728afcd15f823f59cb9ecfdb",
+        "rev": "31ac5fe5d015f76b54058c69fcaebb66a55871a4",
         "type": "github"
       },
       "original": {
@@ -1222,6 +1223,26 @@
         "type": "github"
       }
     },
+    "subtui": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1774815343,
+        "narHash": "sha256-PPnyrnBWhGZQ6KdUoz68WJv3sqtj5mncBIHm2MMaC7A=",
+        "owner": "MattiaPun",
+        "repo": "SubTUI",
+        "rev": "ae09ba5351a35a10bafc602d433fbea9be0e2d26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "MattiaPun",
+        "repo": "SubTUI",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -1407,11 +1428,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1775531191,
-        "narHash": "sha256-dyGsew/ULeVLbWWnMIHvAoYA3je0ywMgXDSzLAfwdNw=",
+        "lastModified": 1775870717,
+        "narHash": "sha256-8dyHQR5Ssy2lZplDErqDZ5ri33Okc16+TJUEp3Y5Rn4=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "f6408656b42c3c370e4b61cb27490a93afcae4a7",
+        "rev": "80a54c3dd555ed3957c3dec53c79174351e85731",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 4fd7b8e..a59d6fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,6 +60,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    subtui = {
+      url = "github:MattiaPun/SubTUI";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # Editors
     nixvim = {
       url = "github:nix-community/nixvim";
@@ -101,6 +106,8 @@
       ...
     }@inputs:
     let
+      unstablePkgs = import nixpkgs { };
+      stablePkgs = import nixpkgs-stable { };
       mkHost =
         {
           hostname,
@@ -108,19 +115,15 @@
           isStable ? false,
           path ? ./hosts/${hostname}/configuration.nix,
         }:
-        let
-          basePkgs = if isStable then nixpkgs-stable else nixpkgs;
-          actualPath = if path != null then path else ./hosts/${hostname}/configuration.nix;
-        in
-        basePkgs.lib.nixosSystem {
+        nixpkgs.lib.nixosSystem {
           specialArgs = {
             inherit inputs;
             username = user;
-            pkgs-unstable = import inputs.nixpkgs { config.allowUnfree = true; };
-            pkgs-stable = import inputs.nixpkgs-stable { config.allowUnfree = true; };
+            pkgs-unstable = unstablePkgs;
+            pkgs-stable = stablePkgs;
           };
           modules = [
-            actualPath
+            path
             { networking.hostName = hostname; }
           ];
         };
diff --git a/hm/editors/nixvim/nixvim.nix b/hm/editors/nixvim/nixvim.nix
index b623f75..ea6398b 100644
--- a/hm/editors/nixvim/nixvim.nix
+++ b/hm/editors/nixvim/nixvim.nix
@@ -17,7 +17,7 @@ in
     programs.nixvim = {
       diagnostics.virtual_text = false;
       enable = true;
-      package = inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default;
+      package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
 
       viAlias = true;
       vimAlias = true;
diff --git a/hm/editors/nvf/nvf.nix b/hm/editors/nvf/nvf.nix
index f9ba866..dc6c072 100644
--- a/hm/editors/nvf/nvf.nix
+++ b/hm/editors/nvf/nvf.nix
@@ -17,7 +17,7 @@ in
       enable = true;
 
       settings.vim = {
-        package = inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default;
+        package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
 
         viAlias = true;
         vimAlias = true;
diff --git a/hm/env/fsel.nix b/hm/env/fsel.nix
index faa7f24..d942363 100644
--- a/hm/env/fsel.nix
+++ b/hm/env/fsel.nix
@@ -11,6 +11,6 @@ in
 {
   options.hm.env.fsel.enable = lib.mkEnableOption "enables fsel";
   config = lib.mkIf cfg.enable {
-    home.packages = [ inputs.fsel.packages.${pkgs.stdenv.hostPlatform.system}.default ];
+    home.packages = [ inputs.fsel.packages.${pkgs.system}.default ];
   };
 }
diff --git a/hm/shell/shell.nix b/hm/shell/shell.nix
index a1ca34d..b394626 100644
--- a/hm/shell/shell.nix
+++ b/hm/shell/shell.nix
@@ -5,5 +5,6 @@
     ./fish.nix
     ./foot.nix
     ./starship.nix
+    ./zellij.nix
   ];
 }
diff --git a/hm/shell/zellij.nix b/hm/shell/zellij.nix
new file mode 100644
index 0000000..333d554
--- /dev/null
+++ b/hm/shell/zellij.nix
@@ -0,0 +1,14 @@
+{ lib, config, ... }:
+let
+  cfg = config.hm.shell.zellij;
+in
+{
+  options.hm.shell.zellij.enable = lib.mkEnableOption "enables zellij terminal multiplexer";
+
+  config = lib.mkIf cfg.enable {
+    programs.zellij = {
+      enable = true;
+      # enableFishIntegration = true;
+    };
+  };
+}
diff --git a/hm/soft/mpv.nix b/hm/soft/mpv.nix
index 2878727..af1d941 100644
--- a/hm/soft/mpv.nix
+++ b/hm/soft/mpv.nix
@@ -165,17 +165,14 @@ in
 
       scripts = with pkgs.mpvScripts; [
         webtorrent-mpv-hook
-        visualizer
         videoclip
         thumbfast
         reload
         mpv-subtitle-lines
         mpv-notify-send
-        # mpv-cheatsheet
         modernx
         memo
         autosubsync-mpv
-        autosub
         sponsorblock
       ];
     };
diff --git a/hm/soft/spicetify.nix b/hm/soft/spicetify.nix
index 59ed287..98aebe3 100644
--- a/hm/soft/spicetify.nix
+++ b/hm/soft/spicetify.nix
@@ -1,7 +1,13 @@
-{ inputs, pkgs, config, lib, ... }:
+{
+  inputs,
+  pkgs,
+  config,
+  lib,
+  ...
+}:
 let
   cfg = config.hm.soft.spicetify;
-  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
 in
 {
   imports = [ inputs.spicetify-nix.homeManagerModules.default ];
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 1f31a46..f6ecf55 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -1,4 +1,9 @@
-{ config, username, ... }:
+{
+  config,
+  username,
+  inputs,
+  ...
+}:
 {
   system.stateVersion = "25.05";
 
@@ -68,6 +73,7 @@
       files = {
         enable = true;
         localsend.enable = true;
+        krusader.enable = true;
       };
       gaming = {
         enable = true;
@@ -90,6 +96,12 @@
     };
   };
 
+  virtualisation.waydroid.enable = true;
+
+  environment.systemPackages = [
+    inputs.subtui.packages.x86_64-linux.subtui
+  ];
+
   boot = {
     kernelModules = [
       "nct6687"
diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix
index be7bbdc..6685e8e 100644
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -1,41 +1,60 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "ahci"
+    "xhci_pci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/aa9c6208-2cc3-413c-a52a-5e0fdf93e748";
-      fsType = "btrfs";
-      options = [ "noatime" ];
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/aa9c6208-2cc3-413c-a52a-5e0fdf93e748";
+    fsType = "btrfs";
+    options = [ "noatime" ];
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/A687-03D4";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/A687-03D4";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/694036da-fc6e-4c7c-8765-7b90fb9a04c8";
-      fsType = "btrfs";
-      options = [ "noatime" ];
-    };
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/694036da-fc6e-4c7c-8765-7b90fb9a04c8";
+    fsType = "btrfs";
+    options = [ "noatime" ];
+  };
 
-  fileSystems."/storage" =
-    { device = "/dev/disk/by-uuid/c0dc7c4d-1800-4c84-a04c-5ea7f5e86c4b";
-      fsType = "ext4";
-      options = [ "nofail" "noatime" ];
-    };
+  fileSystems."/storage" = {
+    device = "/dev/disk/by-uuid/c0dc7c4d-1800-4c84-a04c-5ea7f5e86c4b";
+    fsType = "ext4";
+    options = [
+      "nofail"
+      "noatime"
+    ];
+  };
 
   swapDevices = [ ];
 
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index e8581bc..eea90e7 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -41,6 +41,7 @@
     };
     shell = {
       cli.enable = true;
+      zellij.enable = true;
       fish.enable = true;
       foot.enable = true;
       starship.enable = true;
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
deleted file mode 100644
index df4ba29..0000000
--- a/hosts/laptop/configuration.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ username, ... }:
-{
-  system.stateVersion = "25.05";
-
-  imports = [
-    ./hardware-configuration.nix
-    ../../os/default.nix
-  ];
-
-  os = {
-    core = {
-      allowUnfree.enable = true;
-
-      audio.enable = true;
-      bootloader = {
-        type = "grub";
-        grub = {
-          useOSProber = true;
-          defaultEntry = 2;
-        };
-      };
-      drivers = {
-        enable = true;
-        cpu = "amd";
-        graphics.enable = true;
-      };
-      fonts.enable = true;
-      greet.enable = true;
-      home-manager = {
-        enable = true;
-        users.${username}.path = ./home.nix;
-      };
-      locale.enable = true;
-      memory = {
-        zram.enable = true;
-        swapfile.enable = true;
-      };
-      network.enable = true;
-      power = {
-        enable = true;
-        mode = "amd";
-      };
-      security.enable = true;
-      ssh.enable = true;
-      storage.enable = true;
-      users.enable = true;
-    };
-    srv = {
-      bluetooth.enable = true;
-      files.enable = true;
-      gaming.enable = true;
-      nix-helper.enable = true;
-      kdeconnect.enable = true;
-      sops.enable = true;
-    };
-    wm = {
-      enable = true;
-      niri.enable = true;
-    };
-  };
-}
diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix
deleted file mode 100644
index 527535a..0000000
--- a/hosts/laptop/hardware-configuration.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/3ad0b58c-eb15-475d-b29d-e9dd0c0f5e79";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
-
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/3ad0b58c-eb15-475d-b29d-e9dd0c0f5e79";
-      fsType = "btrfs";
-      options = [ "subvol=nix" ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/3ad0b58c-eb15-475d-b29d-e9dd0c0f5e79";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
-
-  fileSystems."/.swapvol" =
-    { device = "/dev/disk/by-uuid/3ad0b58c-eb15-475d-b29d-e9dd0c0f5e79";
-      fsType = "btrfs";
-      options = [ "subvol=swap" ];
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/EEF5-007B";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  swapDevices = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
deleted file mode 100644
index 272cca3..0000000
--- a/hosts/laptop/home.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ username, ... }:
-{
-  imports = [ ../../hm/default.nix ];
-
-  home = {
-    username = "${username}";
-    homeDirectory = "/home/${username}";
-    stateVersion = "25.05";
-  };
-
-  hm = {
-    conf = {
-      clip = {
-        enable = true;
-        backend = "wayland";
-      };
-      git.enable = true;
-      xdg-dirs.enable = true;
-      xdg-mime.enable = true;
-    };
-    editors.nixvim.enable = true;
-    env = {
-      niri.enable = true;
-      cursor.enableMiyabi = true;
-
-      waybar.enable = true;
-      themes = {
-        enable = true;
-        gtk.enable = true;
-        qt.enable = true;
-      };
-    };
-    shell = {
-      cli.enable = true;
-      fish.enable = true;
-      foot.enable = true;
-      starship.enable = true;
-    };
-    soft = {
-      browser.librewolf.enable = true;
-      email.thunderbird.enable = true;
-      media.enable = true;
-      mpv.enable = true;
-      nixcord.enable = true;
-      onlyoffice.enable = true;
-      obsidian.enable = true;
-      spicetify.enable = true;
-      torrent.enable = true;
-      yt-dlp.enable = true;
-    };
-  };
-}
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";