2 files changed, 51 insertions, 34 deletions
diff --git a/src/lua/include/lua_registry.hpp b/src/lua/include/lua_registry.hpp
new file mode 100644
index 00000000..abc5063e
--- /dev/null
+++ b/src/lua/include/lua_registry.hpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2023 jacqueline <me@jacqueline.id.au>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include "lua.hpp"
+
+#include "bridge.hpp"
+#include "lua_thread.hpp"
+#include "service_locator.hpp"
+
+namespace lua {
+
+class Registry {
+ public:
+  static auto instance(system_fsm::ServiceLocator&) -> Registry&;
+
+  auto uiThread() -> std::shared_ptr<LuaThread>;
+  auto newThread() -> std::shared_ptr<LuaThread>;
+
+  auto AddPropertyModule(
+      const std::string&,
+      std::vector<std::pair<std::string, std::variant<LuaFunction, Property*>>>)
+      -> void;
+
+  Registry(const Registry&) = delete;
+  Registry& operator=(const Registry&) = delete;
+
+ private:
+  Registry(system_fsm::ServiceLocator&);
+
+  system_fsm::ServiceLocator& services_;
+  std::unique_ptr<Bridge> bridge_;
+
+  std::shared_ptr<LuaThread> ui_thread_;
+  std::list<std::weak_ptr<LuaThread>> threads_;
+
+  std::vector<
+      std::pair<std::string,
+                std::vector<std::pair<std::string,
+                                      std::variant<LuaFunction, Property*>>>>>
+      modules_;
+};
+
+}  // namespace lua
diff --git a/src/lua/include/lua_thread.hpp b/src/lua/include/lua_thread.hpp
index c12a0bfc..384de61d 100644
--- a/src/lua/include/lua_thread.hpp
+++ b/src/lua/include/lua_thread.hpp
@@ -10,9 +10,7 @@
 #include <string>
 
 #include "lua.hpp"
-#include "lvgl.h"
 
-#include "bridge.hpp"
 #include "service_locator.hpp"
 
 namespace lua {
@@ -43,36 +41,4 @@ class LuaThread {
   lua_State* state_;
 };
 
-class Registry {
- public:
-  static auto instance(system_fsm::ServiceLocator&) -> Registry&;
-
-  auto uiThread() -> std::shared_ptr<LuaThread>;
-  auto newThread() -> std::shared_ptr<LuaThread>;
-
-  auto AddPropertyModule(
-      const std::string&,
-      std::vector<
-          std::pair<std::string, std::variant<LuaFunction, Property*>>>)
-      -> void;
-
-  Registry(const Registry&) = delete;
-  Registry& operator=(const Registry&) = delete;
-
- private:
-  Registry(system_fsm::ServiceLocator&);
-
-  system_fsm::ServiceLocator& services_;
-  std::unique_ptr<Bridge> bridge_;
-
-  std::shared_ptr<LuaThread> ui_thread_;
-  std::list<std::weak_ptr<LuaThread>> threads_;
-
-  std::vector<
-      std::pair<std::string,
-                std::vector<std::pair<std::string,
-                                      std::variant<LuaFunction, Property*>>>>>
-      modules_;
-};
-
 }  // namespace lua