From d7455d98a118fd601de84bce550c34cd03da1e7a Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Thu, 3 Feb 2022 11:12:56 +0100
Subject: [PATCH] Switch mycroft settings over to ovos settings (and remove
 holmes)

---
 .../rootfs-overlay/etc/mycroft/holmes.conf    | 48 -------------------
 .../etc/mycroft/{mycroft.conf => ovos.conf}   |  4 --
 2 files changed, 52 deletions(-)
 delete mode 100644 buildroot-external/rootfs-overlay/etc/mycroft/holmes.conf
 rename buildroot-external/rootfs-overlay/etc/mycroft/{mycroft.conf => ovos.conf} (96%)

diff --git a/buildroot-external/rootfs-overlay/etc/mycroft/holmes.conf b/buildroot-external/rootfs-overlay/etc/mycroft/holmes.conf
deleted file mode 100644
index 8962b134..00000000
--- a/buildroot-external/rootfs-overlay/etc/mycroft/holmes.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-   // check xdg directories OR only check old style hardcoded paths
-   // the default value is False so the default behaviour is the same as mycroft-core
-   // once MycroftAI/mycroft-core/pull/2794 is merged the default value will change to True
-   "xdg": true,
-
-   // the "name of the core",
-   //         eg, OVOS, Neon, Chatterbox...
-   //  all XDG paths should respect this
-   //        {xdg_path}/{base_folder}/some_resource
-   // "mycroft.conf" default paths are derived from this
-   //        /opt/{base_folder}/mycroft.conf
-   //        ~/.{base_folder}/mycroft.conf
-   "base_folder": "mycroft",
-
-   // the filename of "mycroft.conf",
-   //      eg, ovos.conf, chatterbox.conf, neon.conf...
-   // "mycroft.conf" default paths are derived from this
-   //        /opt/{base_folder}/{config_filename}
-   //        ~/.{base_folder}/{config_filename}
-   "config_filename": "mycroft.conf"
-
-   // override the default.conf location, allows changing the default values
-   //     eg, disable backend, disable skills, configure permissions
-   //"default_config_path": "/etc/HolmesV/default_mycroft.conf",
-   
-   // this is intended for derivative products, if a module name is present 
-   // in sys.modules then the values below will be used instead
-   //     eg, chatterbox/mycroft/ovos/neon can coexist in the same machine
-   //"module_overrides": {
-   //     "chatterbox": {
-   //         "xdg": false, 
-   //         "base_folder": "chatterbox",
-   //         "config_filename": "chatterbox.conf",
-   //         "default_config_path": "/opt/chatterbox/chatterbox.conf"
-   //     },
-   //     "ovos": {
-   //         "xdg": true, 
-   //         "base_folder": "ovos",
-   //         "config_filename": "ovos.conf"
-   //     },
-   //     "neon": {
-   //         "xdg": true, 
-   //         "base_folder": "neon",
-   //         "config_filename": "neon.conf"
-   //     }
-   //}
-}
diff --git a/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf b/buildroot-external/rootfs-overlay/etc/mycroft/ovos.conf
similarity index 96%
rename from buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf
rename to buildroot-external/rootfs-overlay/etc/mycroft/ovos.conf
index 9fdc2d01..4bf8546f 100644
--- a/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf
+++ b/buildroot-external/rootfs-overlay/etc/mycroft/ovos.conf
@@ -41,11 +41,7 @@
   },
   "skills": {
     "wait_for_internet": true,
-    "msm": {
-      "disabled": true
-    },
     "upload_skill_manifest": false,
-    "auto_update": false,
     "blacklisted_skills": [
       "mycroft-pairing.mycroftai",
       "mycroft-volume.mycroftai",