diff --git a/home/christoph/servenix/default.nix b/home/christoph/servenix/default.nix
deleted file mode 100644
index 6dec3480..00000000
--- a/home/christoph/servenix/default.nix
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-  inputs,
-  hostname,
-  username,
-  lib,
-  mylib,
-  config,
-  nixosConfig,
-  pkgs,
-  ...
-}:
-# Here goes the stuff that will only be enabled on the desktop
-rec {
-  imports = [
-    ../../modules
-  ];
-
-  config = {
-    # Use mkForce to not pull the entire ballast from /home/christoph/default.nix
-
-    modules = lib.mkForce {
-      audio.enable = false;
-      chromium.enable = false;
-      emacs.enable = false;
-      email.enable = false;
-      firefox.enable = false;
-      fish.enable = true;
-      flatpak.enable = false;
-      gaming.enable = false;
-      helix.enable = true;
-      hyprland.enable = false;
-      kitty.enable = false;
-      misc.enable = false;
-      neovim.enable = false;
-      nextcloud.enable = false;
-      nnn.enable = true;
-      ranger.enable = false;
-      rofi.enable = false;
-      vscode.enable = false;
-      waybar.enable = false;
-    };
-
-    home.packages = with pkgs; lib.mkForce [
-      ffmpeg_5-full # v5, including ffplay
-      imagemagick # Convert image (magic)
-      gdu # Alternative to du-dust (I like it better)
-      duf # Disk usage analyzer (for all disk overview)
-      fd # find alternative
-      sd # sed alternative
-      fclones # duplicate file finder
-      unrar
-      p7zip
-      ffmpegthumbnailer # Video thumbnails
-      mediainfo
-      tree # Folder preview
-      progress
-      wget # download that shit
-      cachix
-    ];
-
-    programs = lib.mkForce {
-      home-manager.enable = true;
-      
-      bat = {
-        enable = true;
-
-        themes = {
-          catppuccin-latte = builtins.readFile (pkgs.fetchFromGitHub {
-            owner = "catppuccin";
-            repo = "bat";
-            rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-            sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-          } + "/Catppuccin-latte.tmTheme");
-        };
-
-        config = {
-          theme = "catppuccin-latte";
-        };
-      };
-
-      exa.enable = true;
-
-      ssh.enable = true;
-
-      starship = let
-        flavour = "latte"; # One of `latte`, `frappe`, `macchiato`, or `mocha`
-      in {
-        enable = true;
-        enableFishIntegration = true;
-        settings =
-          {
-            # Other config here
-            format = "$all"; # Remove this line to disable the default prompt format
-            palette = "catppuccin_${flavour}";
-          }
-          // builtins.fromTOML (builtins.readFile
-            (pkgs.fetchFromGitHub
-              {
-                owner = "catppuccin";
-                repo = "starship";
-                rev = "3e3e54410c3189053f4da7a7043261361a1ed1bc";
-                sha256 = "sha256-soEBVlq3ULeiZFAdQYMRFuswIIhI9bclIU8WXjxd7oY=";
-              }
-              + /palettes/${flavour}.toml));
-      };
-
-      yt-dlp.enable = true;
-    };
-  };
-}
diff --git a/system/default.nix b/system/default.nix
index 7d4ea4d5..f6318f68 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -45,13 +45,14 @@ with mylib.networking; {
     };
   };
 
-  networking.hosts = {
-    "192.168.86.50" = ["nixinator"];
-    "192.168.86.4" = ["proxmox"];
-    "192.168.86.20" = ["truenas"];
-    "192.168.86.5" = ["opnsense"];
-    "192.168.86.25" = ["servenix"];
-  };
+  # NOTE: This should be handled by my local DNS
+  # networking.hosts = {
+  #   "192.168.86.50" = ["nixinator"];
+  #   "192.168.86.4" = ["proxmox"];
+  #   "192.168.86.20" = ["truenas"];
+  #   "192.168.86.5" = ["opnsense"];
+  #   "192.168.86.25" = ["servenix"];
+  # };
 
   # Enable flakes
   nix = {