diff --git a/mkDocs.nix b/mkDocs.nix
index d7991bb..12d24eb 100644
--- a/mkDocs.nix
+++ b/mkDocs.nix
@@ -6,41 +6,6 @@
   inputs,
   ...
 }: let
-  # Make sure the used package is scrubbed to avoid actually
-  # instantiating derivations.
-  # evaluate our options
-  evalHome = lib.evalModules {
-    # TODO: understand why pkgs needs to be passed here
-    specialArgs = {inherit pkgs;};
-    modules = [
-      {
-        # disabled checking that all option definitions have matching declarations
-        config._module.check = false;
-      }
-      inputs.home-manager.nixosModules.default
-      ./home-manager/fonts
-      ./home-manager/foot
-      ./home-manager/fzf
-      ./home-manager/git
-      ./home-manager/gruvboxTheme
-      ./home-manager/helix
-      ./home-manager/homeManagerScripts
-      ./home-manager/jiten
-      ./home-manager/joshuto
-      ./home-manager/kakoune
-      ./home-manager/ssh
-      ./home-manager/terminalTools
-      ./home-manager/userDirs
-      ./home-manager/zathura
-      ./home-manager/zsh
-    ];
-  };
-  # generate our docs
-  optionsDocHome = nixosOptionsDoc {
-    inherit (evalHome) options;
-  };
-
-  # Same for nixos
   evalNixos = lib.evalModules {
     specialArgs = {inherit pkgs;};
     modules = [
@@ -48,8 +13,7 @@
         config._module.check = false;
       }
       inputs.home-manager.nixosModules.default
-      ./nixos/servarr
-      ./nixos/nixosScripts
+      ./servarr
     ];
   };
   optionsDocNixos = nixosOptionsDoc {
@@ -59,6 +23,5 @@ in
   # create a derivation for capturing the markdown output
   runCommand "options-doc.md" {} ''
     mkdir -p $out
-    cat ${optionsDocHome.optionsCommonMark} | tail -n +210 >> $out/home.md
     cat ${optionsDocNixos.optionsCommonMark} | tail -n +210 >> $out/nixos.md
   ''
diff --git a/mkHugo.nix b/mkHugo.nix
index 441a824..125d344 100644
--- a/mkHugo.nix
+++ b/mkHugo.nix
@@ -3,8 +3,7 @@ pkgs.writeShellApplication {
   name = "my-script";
   runtimeInputs = with pkgs; [hugo];
   text = ''
-    cat hugo/content/header.md result/home.md | sed "s/DATE-TIMESTAMP/$(date -u +%Y-%m-%d)/g" > hugo/content/home-manager/index.md
-    cat hugo/content/header.md result/nixos.md | sed "s/DATE-TIMESTAMP/$(date -u +%Y-%m-%d)/g" > hugo/content/nixos/index.md
+    cat hugo/content/header.md result/nixos.md | sed "s/DATE-TIMESTAMP/$(date -u +%Y-%m-%d)/g" > hugo/content/index.md
     cd hugo
     hugo
   '';
diff --git a/util/default.nix b/util/default.nix
index 1643aa4..c22cf7c 100644
--- a/util/default.nix
+++ b/util/default.nix
@@ -1,19 +1,6 @@
 {
   imports = [
-    ./fonts
-    ./foot
-    ./fzf
-    ./git
-    ./gruvboxTheme
-    ./helix
-    ./homeManagerScripts
-    ./jiten
-    ./joshuto
-    ./kakoune
-    ./ssh
-    ./terminalTools
-    ./userDirs
-    ./zathura
-    ./zsh
+    ./upnp
+    ./vpnNamespace
   ];
 }
diff --git a/util/vpnNamespace/default.nix b/util/vpnNamespace/default.nix
index 110be2a..704970d 100644
--- a/util/vpnNamespace/default.nix
+++ b/util/vpnNamespace/default.nix
@@ -110,9 +110,9 @@ in {
 
     dnsServers = mkOption {
       type = with types; nullOr (listOf str);
-      default = loadDns wireguardConfigFile; #[ "1.1.1.2" ];
+      default = [];
       description = lib.mdDoc ''
-        YOUR VPN WILL LEAK IF THIS IS NOT SET. The dns address of your vpn.
+        DNS servers to append to any found in the wg-quick config file.
       '';
       example = ["1.1.1.2"];
     };