6 files changed, 118 insertions, 5 deletions

diff --git a/keyboards/xiudi/xd75/keymaps/zigotica/config.h b/keyboards/xiudi/xd75/keymaps/zigotica/config.h
new file mode 100644
index 0000000000..23e276cf6e
--- /dev/null
+++ b/keyboards/xiudi/xd75/keymaps/zigotica/config.h
@@ -0,0 +1,27 @@
+/* Copyright 2023 Sergi Meseguer <zigotica@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// these should work better for homerow modifiers
+#define TAPPING_TERM 350
+#define PERMISSIVE_HOLD
+#define QUICK_TAP_TERM 0
+
+// needed to get same layers as split keyboards
+// see users/zigotica/zigotica.h
+#define ORTHOLINEAR_KEYBOARD
+
diff --git a/keyboards/xiudi/xd75/keymaps/zigotica/keymap.c b/keyboards/xiudi/xd75/keymaps/zigotica/keymap.c
new file mode 100644
index 0000000000..4133b57e72
--- /dev/null
+++ b/keyboards/xiudi/xd75/keymaps/zigotica/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2023 Sergi Meseguer <zigotica@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "zigotica.h"
+
+#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [BASE] = LAYOUT_wrapper(
+       KC_ESC,    ____NUM15,     _BLANK_3,    ____NUM60,     KC_DEL, 
+       KC_TAB,    _STENAI_L1,    _BLANK_3,    _STENAI_R1,    _______,
+       KC_EQL,    _STENAI_L2,    _BLANK_3,    _STENAI_R2,    KC_ENT,
+       KC_LSFT,   _STENAI_L3,    ____TARRS,   _STENAI_R3,    KC_RSFT,
+       ____LORTH, _STENAI_LT,    ____BARRS,   _STENAI_RT,    ____RORTH
+    ),
+
+    [_NUM] = LAYOUT_wrapper(
+      QK_MAKE,    _BLANK_ROW,    _BLANK_3,    _BLANK_ROW,    _______,
+      _______,    ____NUM_L1,    _BLANK_3,    ____NUM_R1,    _______,
+      _______,    ____NUM_L2,    _BLANK_3,    ____NUM_R2,    _______,
+      _______,    ____NUM_L3,    _BLANK_3,    ____NUM_R3,    _______,
+      _BLANK_4,   ____NUM_LT,    _BLANK_3,    ____NUM_RT,    _BLANK_4
+    ),
+
+    [_NAV] = LAYOUT_wrapper(
+      QK_MAKE,    _BLANK_ROW,    _BLANK_3,    _BLANK_ROW,    _______,
+      _______,    ____NAV_L1,    _BLANK_3,    ____NAV_R1,    _______,
+      _______,    ____NAV_L2,    _BLANK_3,    ____NAV_R2,    _______,
+      _______,    ____NAV_L3,    _BLANK_3,    ____NAV_R3,    _______,
+      _BLANK_4,   ____NAV_LT,    _BLANK_3,    ____NAV_RT,    _BLANK_4
+    ),
+
+    [_SYM] = LAYOUT_wrapper(
+      QK_MAKE,    _BLANK_ROW,    _BLANK_3,    _BLANK_ROW,    _______,
+      _______,    ____SYM_L1,    _BLANK_3,    ____SYM_R1,    _______,
+      _______,    ____SYM_L2,    _BLANK_3,    ____SYM_R2,    _______,
+      _______,    ____SYM_L3,    _BLANK_3,    ____SYM_R3,    _______,
+      _BLANK_4,   ____SYM_LT,    _BLANK_3,    ____SYM_RT,    _BLANK_4
+    ),
+
+    [_FN] = LAYOUT_wrapper(
+      QK_MAKE,    ____FN_15,     _BLANK_3,    ____FN_60,     _______,
+      _______,    ____FN_L1,     _BLANK_3,    ____FN_R1,     _______,
+      _______,    ____FN_L2,     _BLANK_3,    ____FN_R2,     _______,
+      _______,    ____FN_L3,     _BLANK_3,    ____FN_R3,     _______,
+      _BLANK_4,   ____FN_LT,     _BLANK_3,    ____FN_RT,     _BLANK_4
+    ),
+};
+
+
diff --git a/keyboards/xiudi/xd75/keymaps/zigotica/rules.mk b/keyboards/xiudi/xd75/keymaps/zigotica/rules.mk
new file mode 100644
index 0000000000..c41232e8f9
--- /dev/null
+++ b/keyboards/xiudi/xd75/keymaps/zigotica/rules.mk
@@ -0,0 +1,6 @@
+OLED_SUPPORTED = no
+ENCODER_SUPPORTED = no
+
+MOUSEKEY_ENABLE = yes
+COMBO_ENABLE = yes
+TAP_DANCE_ENABLE = yes
diff --git a/users/zigotica/rows.h b/users/zigotica/rows.h
index 18f08ccb0b..575b32186e 100644
--- a/users/zigotica/rows.h
+++ b/users/zigotica/rows.h
@@ -15,8 +15,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "zigotica.h"
 
 // clang-format off
-#define _BLANK_ROW      _______, _______, _______, _______, _______
 #define _BLANK_THUMB    _______, _______
+#define _BLANK_3        _______, _______, _______
+#define _BLANK_4        _______, _______, _______, _______
+#define _BLANK_ROW      _______, _______, _______, _______, _______
 
 /*
  * STENAI Layer
@@ -60,12 +62,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define _COLEMAK_R3     KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH
 
 #define _QWERTY_L1      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T
-#define _QWERTY_L2      KC_A,    KC_S,    KC_D,    KC_F,    KC_G
+#define _QWERTY_L2      LALT_T(KC_A),     LCTL_T(KC_S),    LSFT_T(KC_D),  LGUI_T(KC_F),     KC_G
 #define _QWERTY_L3      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
+#define _QWERTY_LT      LT(_NUM, KC_TAB), LT(_NAV, KC_SPC)
 
 #define _QWERTY_R1      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P
-#define _QWERTY_R2      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT
+#define _QWERTY_R2      KC_H,    RGUI_T(KC_J),    RSFT_T(KC_K),  RCTL_T(KC_L), RALT_T(KC_SCLN)
 #define _QWERTY_R3      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH
+#define _QWERTY_RT      LT(_SYM, KC_SPC), LT(_FN, KC_ENT)
 
 /*
  * NUM Layer
@@ -191,4 +195,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ____FN_R2       _______,  KC_F1,  KC_F2,  KC_F3,  KC_F11
 #define ____FN_R3       _______,  KC_F4,  KC_F5,  KC_F6,  KC_F12
 #define ____FN_RT       _BLANK_THUMB
+
+
+// Ortho short rows
+#define ____NUM15      KC_1,    KC_2,    KC_3,   KC_4,   KC_5
+#define ____NUM60      KC_6,    KC_7,    KC_8,   KC_9,   KC_0
+#define ____FN_15      KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5
+#define ____FN_60      KC_F6,   KC_F7,   KC_F8,  KC_F9,  KC_F10
+#define ____LMODS      KC_LCTL, KC_LALT, KC_LGUI
+#define ____TARRS      _______, KC_UP,   _______
+#define ____BARRS      KC_LEFT, KC_DOWN, KC_RIGHT
+#define ____LORTH      ____LMODS, KC_MINS
+#define ____RORTH      KC_BSPC, KC_SCLN, KC_BSLS, KC_SLSH
+
 // clang-format on
diff --git a/users/zigotica/rules.mk b/users/zigotica/rules.mk
index 019e6f6dda..93b0b5704d 100644
--- a/users/zigotica/rules.mk
+++ b/users/zigotica/rules.mk
@@ -5,7 +5,7 @@ ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(COMBO_ENABLE)), yes)
-    SRC += combos.c
+        INTROSPECTION_KEYMAP_C = combos.c
 endif
 
 ifeq ($(strip $(OLED_ENABLE)), yes)
diff --git a/users/zigotica/zigotica.h b/users/zigotica/zigotica.h
index e85a04edbe..e7ac83e0dc 100644
--- a/users/zigotica/zigotica.h
+++ b/users/zigotica/zigotica.h
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "rows.h"
 
-#ifdef SPLIT_KEYBOARD
+#if defined(SPLIT_KEYBOARD) || defined(ORTHOLINEAR_KEYBOARD)
 enum userspace_layers {
     BASE = 0,
     _NUM,