diff --git a/home-manager/nathan/services/default.nix b/home-manager/nathan/services/default.nix
index d2e0900..4ebe959 100644
--- a/home-manager/nathan/services/default.nix
+++ b/home-manager/nathan/services/default.nix
@@ -1,5 +1,6 @@
 { ... }: {
     imports = [
         ./mpd
+        ./wayvnc
     ];
 }
diff --git a/system-config/configuration/homebox/default.nix b/system-config/configuration/homebox/default.nix
index 44ebfa5..2cd7db7 100644
--- a/system-config/configuration/homebox/default.nix
+++ b/system-config/configuration/homebox/default.nix
@@ -224,6 +224,7 @@
           config.homeconfig = {
             host = "homebox";
             minimal = false;
+            wayvnc.enable = true;
               impermanence.enable = true;
             hyprland.enable = true;
             swaylock.enable = true;
@@ -252,7 +253,6 @@
       wyoming.enable = false;
       minecraft.enable = false;
       steam.enable = false;
-      wayvnc.enable = true;
         virtualization = {
             traefik.enable = true;
             jellyfin.enable = true;
diff --git a/system-config/services/wyoming/default.nix b/system-config/services/wyoming/default.nix
deleted file mode 100644
index d784c7b..0000000
--- a/system-config/services/wyoming/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ config, lib, ... }: {
-
-    options.sysconfig.opts.wyoming = {
-        enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-        piper = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-        openwakeword = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-        faster-whisper = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-        satellite = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = lib.mkIf config.sysconfig.opts.wyoming.enable {
-        services.wyoming = {
-
-            piper = lib.mkIf config.sysconfig.opts.wyoming.piper {
-
-                servers.piper = {
-                    enable = true;
-                    voice = "en-us-ryan-medium";
-                    uri = "tcp://0.0.0.0:11435";
-                };
-            };
-
-            openwakeword = lib.mkIf config.sysconfig.opts.wyoming.openwakeword {
-                enable = true;
-                uri = "tcp://0.0.0.0:11432";
-                preloadModels = [
-                    "alexa"
-                    "hey_jarvis"
-                    "ok_nabu"
-                ];
-                threshold = 0.5;
-                customModelsDirectories = [
-                    #./wake_words
-                ];
-            };
-
-            faster-whisper = lib.mkIf config.sysconfig.opts.wyoming.faster-whisper {
-                servers.whisper = {
-                    enable = true;
-                    device = "auto";
-                    language = "en";
-                    model = "medium.en";
-                    uri = "tcp://0.0.0.0:11433";
-                };
-            };
-
-            satellite = lib.mkIf config.sysconfig.opts.wyoming.satellite {
-                enable = true;
-                uri = "tcp://0.0.0.0:11431";
-                user = "nathan";
-                vad.enable = false;
-            };
-        };
-    };
-}