.

hosts/darkgui-vps/config/self-host/self-host.nix

@@ -8,10 +8,6 @@
 {
 
   mods = {
-<<<<<<< HEAD
-    #netbird.enable = true;
-=======
->>>>>>> dd8334c9c024018cca7a75216d680779a606da8a
     tailscale.enable = true;
     flakePath = "/etc/nixos";
   };

mods/nixos/netbird/netbird.nix

@@ -1,14 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-{
-  options.mods.netbird = {
-    enable = lib.mkEnableOption "netbird";
-  };
-
-  config = lib.mkIf config.mods.netbird.enable {
-    services.resolved.enable = false;
-  };
-}