From e21670f3f6dd6a21871500c8d481a68eddd6726c Mon Sep 17 00:00:00 2001
From: kossLAN <kosslan@kosslan.dev>
Date: Fri, 29 May 2026 17:08:55 -0400
Subject: [PATCH] config: move keymap schema into schema crate

---
 jay-config-schema/src/keymap.rs |  8 ++++++++
 jay-config-schema/src/lib.rs    |  2 ++
 toml-config/src/config.rs       | 15 ++++-----------
 3 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 jay-config-schema/src/keymap.rs

diff --git a/jay-config-schema/src/keymap.rs b/jay-config-schema/src/keymap.rs
new file mode 100644
index 00000000..30035a9f
--- /dev/null
+++ b/jay-config-schema/src/keymap.rs
@@ -0,0 +1,8 @@
+use jay_config::keyboard::Keymap;
+
+#[derive(Debug, Clone)]
+pub enum ConfigKeymap {
+    Named(String),
+    Literal(Keymap),
+    Defined { name: String, map: Keymap },
+}
diff --git a/jay-config-schema/src/lib.rs b/jay-config-schema/src/lib.rs
index a50b64c5..ed590361 100644
--- a/jay-config-schema/src/lib.rs
+++ b/jay-config-schema/src/lib.rs
@@ -7,6 +7,7 @@
 pub mod animations;
 pub mod command;
 pub mod input;
+pub mod keymap;
 pub mod options;
 pub mod output;
 pub mod rules;
@@ -15,6 +16,7 @@ pub mod theme;
 pub use animations::{AnimationCurveConfig, Animations};
 pub use command::{Exec, Status};
 pub use input::InputMatch;
+pub use keymap::ConfigKeymap;
 pub use options::{
     ColorManagement, Float, FocusHistory, Libei, RepeatRate, SimpleIm, Tearing, UiDrag, Vrr,
     Xwayland,
diff --git a/toml-config/src/config.rs b/toml-config/src/config.rs
index bdc9c736..7bbbb62b 100644
--- a/toml-config/src/config.rs
+++ b/toml-config/src/config.rs
@@ -25,7 +25,7 @@ use {
             FallbackOutputMode, LayerDirection, SwitchEvent, Timeline, acceleration::AccelProfile,
             clickmethod::ClickMethod,
         },
-        keyboard::{Keymap, ModifiedKeySym, mods::Modifiers, syms::KeySym},
+        keyboard::{ModifiedKeySym, mods::Modifiers, syms::KeySym},
         logging::LogLevel,
         video::GfxApi,
         window::TileState,
@@ -43,9 +43,9 @@ use {
 
 pub use jay_config_schema::{
     AnimationCurveConfig, Animations, ClientMatch, ColorManagement, ConfigConnector,
-    ConfigDrmDevice, ConnectorMatch, DrmDeviceMatch, Exec, Float, FocusHistory, GenericMatch,
-    InputMatch, Libei, MatchExactly, Mode, Output, OutputMatch, RepeatRate, SimpleIm, Status,
-    Tearing, Theme, UiDrag, Vrr, WindowMatch, Xwayland,
+    ConfigDrmDevice, ConfigKeymap, ConnectorMatch, DrmDeviceMatch, Exec, Float, FocusHistory,
+    GenericMatch, InputMatch, Libei, MatchExactly, Mode, Output, OutputMatch, RepeatRate,
+    SimpleIm, Status, Tearing, Theme, UiDrag, Vrr, WindowMatch, Xwayland,
 };
 
 #[derive(Debug, Copy, Clone)]
@@ -243,13 +243,6 @@ pub struct Input {
     pub calibration_matrix: Option<[[f32; 3]; 2]>,
 }
 
-#[derive(Debug, Clone)]
-pub enum ConfigKeymap {
-    Named(String),
-    Literal(Keymap),
-    Defined { name: String, map: Keymap },
-}
-
 #[derive(Debug, Clone)]
 pub struct Shortcut {
     pub mask: Modifiers,