Merge remote-tracking branch 'origin/master' into develop

26 files changed, 876 insertions, 0 deletions

diff --git a/keyboards/nimrod/config.h b/keyboards/nimrod/config.h
new file mode 100644
index 0000000000..4faa3f4e28
--- /dev/null
+++ b/keyboards/nimrod/config.h
@@ -0,0 +1,54 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x6274
+#define PRODUCT_ID 0x720D
+#define DEVICE_VER 0x0001
+#define MANUFACTURER breadtamer
+#define PRODUCT nimrod
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 10
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { F5, B6, D7, C6 }
+#define MATRIX_COL_PINS { D1, F4, B5, B4, E6, F6, F7, B1, B3, B2 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/nimrod/info.json b/keyboards/nimrod/info.json
new file mode 100644
index 0000000000..4df94c2842
--- /dev/null
+++ b/keyboards/nimrod/info.json
@@ -0,0 +1,209 @@
+{
+    "keyboard_name": "Nimrod",
+    "url": "http://www.keyboard-layout-editor.com/#/gists/5a6b4ee1ca9738c4ed90fe95ef35fdf6",
+    "maintainer": "Breadtamer",
+    "width": 12.5,
+    "height": 4,
+    "layouts": {
+        "LAYOUT_ortho_4x10": {
+            "layout": [
+                { "x": 0, "y": 0, "w": 1.25 },
+                { "x": 1.25, "y": 0, "w": 1.25 },
+                { "x": 2.5, "y": 0, "w": 1.25 },
+                { "x": 3.75, "y": 0, "w": 1.25 },
+                { "x": 5, "y": 0, "w": 1.25 },
+                { "x": 6.25, "y": 0, "w": 1.25 },
+                { "x": 7.5, "y": 0, "w": 1.25 },
+                { "x": 8.75, "y": 0, "w": 1.25 },
+                { "x": 10, "y": 0, "w": 1.25 },
+                { "x": 11.25, "y": 0, "w": 1.25 },
+                { "x": 0, "y": 1, "w": 1.25 },
+                { "x": 1.25, "y": 1, "w": 1.25 },
+                { "x": 2.5, "y": 1, "w": 1.25 },
+                { "x": 3.75, "y": 1, "w": 1.25 },
+                { "x": 5, "y": 1, "w": 1.25 },
+                { "x": 6.25, "y": 1, "w": 1.25 },
+                { "x": 7.5, "y": 1, "w": 1.25 },
+                { "x": 8.75, "y": 1, "w": 1.25 },
+                { "x": 10, "y": 1, "w": 1.25 },
+                { "x": 11.25, "y": 1, "w": 1.25 },
+                { "x": 0, "y": 2, "w": 1.25 },
+                { "x": 1.25, "y": 2, "w": 1.25 },
+                { "x": 2.5, "y": 2, "w": 1.25 },
+                { "x": 3.75, "y": 2, "w": 1.25 },
+                { "x": 5, "y": 2, "w": 1.25 },
+                { "x": 6.25, "y": 2, "w": 1.25 },
+                { "x": 7.5, "y": 2, "w": 1.25 },
+                { "x": 8.75, "y": 2, "w": 1.25 },
+                { "x": 10, "y": 2, "w": 1.25 },
+                { "x": 11.25, "y": 2, "w": 1.25 },
+                { "x": 0, "y": 3, "w": 1.25 },
+                { "x": 1.25, "y": 3, "w": 1.25 },
+                { "x": 2.5, "y": 3, "w": 1.25 },
+                { "x": 3.75, "y": 3, "w": 1.25 },
+                { "x": 5, "y": 3, "w": 1.25 },
+                { "x": 6.25, "y": 3, "w": 1.25 },
+                { "x": 7.5, "y": 3, "w": 1.25 },
+                { "x": 8.75, "y": 3, "w": 1.25 },
+                { "x": 10, "y": 3, "w": 1.25 },
+                { "x": 11.25, "y": 3, "w": 1.25 }
+            ]
+        },
+        "LAYOUT_left_space": {
+            "layout": [
+                { "x": 0, "y": 0, "w": 1.25 },
+                { "x": 1.25, "y": 0, "w": 1.25 },
+                { "x": 2.5, "y": 0, "w": 1.25 },
+                { "x": 3.75, "y": 0, "w": 1.25 },
+                { "x": 5, "y": 0, "w": 1.25 },
+                { "x": 6.25, "y": 0, "w": 1.25 },
+                { "x": 7.5, "y": 0, "w": 1.25 },
+                { "x": 8.75, "y": 0, "w": 1.25 },
+                { "x": 10, "y": 0, "w": 1.25 },
+                { "x": 11.25, "y": 0, "w": 1.25 },
+                { "x": 0, "y": 1, "w": 1.25 },
+                { "x": 1.25, "y": 1, "w": 1.25 },
+                { "x": 2.5, "y": 1, "w": 1.25 },
+                { "x": 3.75, "y": 1, "w": 1.25 },
+                { "x": 5, "y": 1, "w": 1.25 },
+                { "x": 6.25, "y": 1, "w": 1.25 },
+                { "x": 7.5, "y": 1, "w": 1.25 },
+                { "x": 8.75, "y": 1, "w": 1.25 },
+                { "x": 10, "y": 1, "w": 1.25 },
+                { "x": 11.25, "y": 1, "w": 1.25 },
+                { "x": 0, "y": 2, "w": 1.25 },
+                { "x": 1.25, "y": 2, "w": 1.25 },
+                { "x": 2.5, "y": 2, "w": 1.25 },
+                { "x": 3.75, "y": 2, "w": 1.25 },
+                { "x": 5, "y": 2, "w": 1.25 },
+                { "x": 6.25, "y": 2, "w": 1.25 },
+                { "x": 7.5, "y": 2, "w": 1.25 },
+                { "x": 8.75, "y": 2, "w": 1.25 },
+                { "x": 10, "y": 2, "w": 1.25 },
+                { "x": 11.25, "y": 2, "w": 1.25 },
+                { "x": 0, "y": 3, "w": 6.25 },
+                { "x": 6.25, "y": 3, "w": 1.25 },
+                { "x": 7.5, "y": 3, "w": 1.25 },
+                { "x": 8.75, "y": 3, "w": 1.25 },
+                { "x": 10, "y": 3, "w": 1.25 },
+                { "x": 11.25, "y": 3, "w": 1.25 }
+            ]
+        },
+        "LAYOUT_center_space": {
+            "layout": [
+                { "x": 0, "y": 0, "w": 1.25 },
+                { "x": 1.25, "y": 0, "w": 1.25 },
+                { "x": 2.5, "y": 0, "w": 1.25 },
+                { "x": 3.75, "y": 0, "w": 1.25 },
+                { "x": 5, "y": 0, "w": 1.25 },
+                { "x": 6.25, "y": 0, "w": 1.25 },
+                { "x": 7.5, "y": 0, "w": 1.25 },
+                { "x": 8.75, "y": 0, "w": 1.25 },
+                { "x": 10, "y": 0, "w": 1.25 },
+                { "x": 11.25, "y": 0, "w": 1.25 },
+                { "x": 0, "y": 1, "w": 1.25 },
+                { "x": 1.25, "y": 1, "w": 1.25 },
+                { "x": 2.5, "y": 1, "w": 1.25 },
+                { "x": 3.75, "y": 1, "w": 1.25 },
+                { "x": 5, "y": 1, "w": 1.25 },
+                { "x": 6.25, "y": 1, "w": 1.25 },
+                { "x": 7.5, "y": 1, "w": 1.25 },
+                { "x": 8.75, "y": 1, "w": 1.25 },
+                { "x": 10, "y": 1, "w": 1.25 },
+                { "x": 11.25, "y": 1, "w": 1.25 },
+                { "x": 0, "y": 2, "w": 1.25 },
+                { "x": 1.25, "y": 2, "w": 1.25 },
+                { "x": 2.5, "y": 2, "w": 1.25 },
+                { "x": 3.75, "y": 2, "w": 1.25 },
+                { "x": 5, "y": 2, "w": 1.25 },
+                { "x": 6.25, "y": 2, "w": 1.25 },
+                { "x": 7.5, "y": 2, "w": 1.25 },
+                { "x": 8.75, "y": 2, "w": 1.25 },
+                { "x": 10, "y": 2, "w": 1.25 },
+                { "x": 11.25, "y": 2, "w": 1.25 },
+                { "x": 0, "y": 3, "w": 1.25 },
+                { "x": 1.25, "y": 3, "w": 1.25 },
+                { "x": 2.5, "y": 3, "w": 6.25 },
+                { "x": 8.75, "y": 3, "w": 1.25 },
+                { "x": 10, "y": 3, "w": 1.25 },
+                { "x": 11.25, "y": 3, "w": 1.25 }
+            ]
+        },
+        "LAYOUT_right_space": {
+            "layout": [
+                { "x": 0, "y": 0, "w": 1.25 },
+                { "x": 1.25, "y": 0, "w": 1.25 },
+                { "x": 2.5, "y": 0, "w": 1.25 },
+                { "x": 3.75, "y": 0, "w": 1.25 },
+                { "x": 5, "y": 0, "w": 1.25 },
+                { "x": 6.25, "y": 0, "w": 1.25 },
+                { "x": 7.5, "y": 0, "w": 1.25 },
+                { "x": 8.75, "y": 0, "w": 1.25 },
+                { "x": 10, "y": 0, "w": 1.25 },
+                { "x": 11.25, "y": 0, "w": 1.25 },
+                { "x": 0, "y": 1, "w": 1.25 },
+                { "x": 1.25, "y": 1, "w": 1.25 },
+                { "x": 2.5, "y": 1, "w": 1.25 },
+                { "x": 3.75, "y": 1, "w": 1.25 },
+                { "x": 5, "y": 1, "w": 1.25 },
+                { "x": 6.25, "y": 1, "w": 1.25 },
+                { "x": 7.5, "y": 1, "w": 1.25 },
+                { "x": 8.75, "y": 1, "w": 1.25 },
+                { "x": 10, "y": 1, "w": 1.25 },
+                { "x": 11.25, "y": 1, "w": 1.25 },
+                { "x": 0, "y": 2, "w": 1.25 },
+                { "x": 1.25, "y": 2, "w": 1.25 },
+                { "x": 2.5, "y": 2, "w": 1.25 },
+                { "x": 3.75, "y": 2, "w": 1.25 },
+                { "x": 5, "y": 2, "w": 1.25 },
+                { "x": 6.25, "y": 2, "w": 1.25 },
+                { "x": 7.5, "y": 2, "w": 1.25 },
+                { "x": 8.75, "y": 2, "w": 1.25 },
+                { "x": 10, "y": 2, "w": 1.25 },
+                { "x": 11.25, "y": 2, "w": 1.25 },
+                { "x": 0, "y": 3, "w": 1.25 },
+                { "x": 1.25, "y": 3, "w": 1.25 },
+                { "x": 2.5, "y": 3, "w": 1.25 },
+                { "x": 3.75, "y": 3, "w": 1.25 },
+                { "x": 5, "y": 3, "w": 1.25 },
+                { "x": 6.25, "y": 3, "w": 6.25 }
+            ]
+        },
+        "LAYOUT_split_space": {
+            "layout": [
+                { "x": 0, "y": 0, "w": 1.25 },
+                { "x": 1.25, "y": 0, "w": 1.25 },
+                { "x": 2.5, "y": 0, "w": 1.25 },
+                { "x": 3.75, "y": 0, "w": 1.25 },
+                { "x": 5, "y": 0, "w": 1.25 },
+                { "x": 6.25, "y": 0, "w": 1.25 },
+                { "x": 7.5, "y": 0, "w": 1.25 },
+                { "x": 8.75, "y": 0, "w": 1.25 },
+                { "x": 10, "y": 0, "w": 1.25 },
+                { "x": 11.25, "y": 0, "w": 1.25 },
+                { "x": 0, "y": 1, "w": 1.25 },
+                { "x": 1.25, "y": 1, "w": 1.25 },
+                { "x": 2.5, "y": 1, "w": 1.25 },
+                { "x": 3.75, "y": 1, "w": 1.25 },
+                { "x": 5, "y": 1, "w": 1.25 },
+                { "x": 6.25, "y": 1, "w": 1.25 },
+                { "x": 7.5, "y": 1, "w": 1.25 },
+                { "x": 8.75, "y": 1, "w": 1.25 },
+                { "x": 10, "y": 1, "w": 1.25 },
+                { "x": 11.25, "y": 1, "w": 1.25 },
+                { "x": 0, "y": 2, "w": 1.25 },
+                { "x": 1.25, "y": 2, "w": 1.25 },
+                { "x": 2.5, "y": 2, "w": 1.25 },
+                { "x": 3.75, "y": 2, "w": 1.25 },
+                { "x": 5, "y": 2, "w": 1.25 },
+                { "x": 6.25, "y": 2, "w": 1.25 },
+                { "x": 7.5, "y": 2, "w": 1.25 },
+                { "x": 8.75, "y": 2, "w": 1.25 },
+                { "x": 10, "y": 2, "w": 1.25 },
+                { "x": 11.25, "y": 2, "w": 1.25 },
+                { "x": 0, "y": 3, "w": 6.25 },
+                { "x": 6.25, "y": 3, "w": 6.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/nimrod/keymaps/default/config.h b/keyboards/nimrod/keymaps/default/config.h
new file mode 100644
index 0000000000..9684b5caed
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 3
+#    define COMBO_TERM 150
+#endif
diff --git a/keyboards/nimrod/keymaps/default/keymap.c b/keyboards/nimrod/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3a113bbc8c
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default/keymap.c
@@ -0,0 +1,60 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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 QMK_KEYBOARD_H
+
+enum layers{
+  _BASE,
+  _NUM_SYM
+};
+
+enum combo_events {
+  COMBO_TAB,
+  COMBO_ESC,
+  COMBO_DEL,
+};
+
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_ortho_4x10(
+  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,         KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,
+  KC_A,    KC_S,    KC_D,    KC_SF,   KC_G,         KC_H,   KC_SJ,   KC_K,    KC_L,    KC_ENT,
+  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,         KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+  KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, MO(_NUM_SYM), KC_SPC, KC_LEFT, KC_UP,   KC_DOWN, KC_RIGHT
+  ),
+
+  [_NUM_SYM] = LAYOUT_ortho_4x10(
+  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
+  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
+  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLASH,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS
+  ),
+
+};
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
+  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
+
+};
+#endif
diff --git a/keyboards/nimrod/keymaps/default/readme.md b/keyboards/nimrod/keymaps/default/readme.md
new file mode 100644
index 0000000000..b93c8f8469
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# Default Nimrod Layout
+
+This is the recommended full grid layout.
diff --git a/keyboards/nimrod/keymaps/default/rules.mk b/keyboards/nimrod/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/nimrod/keymaps/default_center_space/config.h b/keyboards/nimrod/keymaps/default_center_space/config.h
new file mode 100644
index 0000000000..9684b5caed
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_center_space/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 3
+#    define COMBO_TERM 150
+#endif
diff --git a/keyboards/nimrod/keymaps/default_center_space/keymap.c b/keyboards/nimrod/keymaps/default_center_space/keymap.c
new file mode 100644
index 0000000000..0ebb2bb9e7
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_center_space/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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 QMK_KEYBOARD_H
+
+enum layers{
+  _BASE,
+  _NUM_SYM,
+  _NAV
+};
+
+enum combo_events {
+  COMBO_TAB,
+  COMBO_ESC,
+  COMBO_DEL,
+};
+
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_center_space(
+  KC_Q,    KC_W,    KC_E, KC_R,  KC_T, KC_Y, KC_U,  KC_I,         KC_O,    KC_P,
+  KC_A,    KC_S,    KC_D, KC_SF, KC_G, KC_H, KC_SJ, KC_K,         KC_L,    KC_ENT,
+  KC_Z,    KC_X,    KC_C, KC_V,  KC_B, KC_N, KC_M,  KC_COMM,      KC_DOT,  KC_SLSH,
+  KC_LCTL, KC_LALT,        LT(_NAV, KC_SPC),        MO(_NUM_SYM), KC_BSPC, KC_RGUI
+  ),
+
+  [_NUM_SYM] = LAYOUT_center_space(
+  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
+  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
+  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLASH,
+  KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS,  KC_TRNS
+  ),
+
+  [_NAV] = LAYOUT_center_space(
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS,  KC_TRNS
+  ),
+
+};
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
+  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
+
+};
+#endif
diff --git a/keyboards/nimrod/keymaps/default_center_space/readme.md b/keyboards/nimrod/keymaps/default_center_space/readme.md
new file mode 100644
index 0000000000..4912b44c40
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_center_space/readme.md
@@ -0,0 +1,3 @@
+# Center Space Nimrod Layout
+
+This is the layout for a center space bottom row.
diff --git a/keyboards/nimrod/keymaps/default_center_space/rules.mk b/keyboards/nimrod/keymaps/default_center_space/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_center_space/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/nimrod/keymaps/default_left_space/config.h b/keyboards/nimrod/keymaps/default_left_space/config.h
new file mode 100644
index 0000000000..9684b5caed
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_left_space/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 3
+#    define COMBO_TERM 150
+#endif
diff --git a/keyboards/nimrod/keymaps/default_left_space/keymap.c b/keyboards/nimrod/keymaps/default_left_space/keymap.c
new file mode 100644
index 0000000000..c03130b811
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_left_space/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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 QMK_KEYBOARD_H
+
+enum layers{
+  _BASE,
+  _NUM_SYM,
+  _NAV
+};
+
+enum combo_events {
+  COMBO_TAB,
+  COMBO_ESC,
+  COMBO_DEL,
+};
+
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_left_space(
+  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, KC_Y,         KC_U,    KC_I,    KC_O,    KC_P,
+  KC_A,    KC_S,    KC_D,    KC_SF,   KC_G, KC_H,         KC_SJ,   KC_K,    KC_L,    KC_ENT,
+  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_N,         KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+              LT(_NAV, KC_SPC),             MO(_NUM_SYM), KC_BSPC, KC_RGUI, KC_RALT, KC_RCTL
+  ),
+
+  [_NUM_SYM] = LAYOUT_left_space(
+  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
+  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
+  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLASH,
+                    KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS
+  ),
+
+  [_NAV] = LAYOUT_left_space(
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                    KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+};
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
+  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
+
+};
+#endif
diff --git a/keyboards/nimrod/keymaps/default_left_space/readme.md b/keyboards/nimrod/keymaps/default_left_space/readme.md
new file mode 100644
index 0000000000..e331b9c297
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_left_space/readme.md
@@ -0,0 +1,3 @@
+# Left Space Nimrod Layout
+
+This is the layout for a left space bottom row.
diff --git a/keyboards/nimrod/keymaps/default_left_space/rules.mk b/keyboards/nimrod/keymaps/default_left_space/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_left_space/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/nimrod/keymaps/default_right_space/config.h b/keyboards/nimrod/keymaps/default_right_space/config.h
new file mode 100644
index 0000000000..9684b5caed
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_right_space/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 3
+#    define COMBO_TERM 150
+#endif
diff --git a/keyboards/nimrod/keymaps/default_right_space/keymap.c b/keyboards/nimrod/keymaps/default_right_space/keymap.c
new file mode 100644
index 0000000000..b6d108ed07
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_right_space/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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 QMK_KEYBOARD_H
+
+enum layers{
+  _BASE,
+  _NUM_SYM,
+  _NAV
+};
+
+enum combo_events {
+  COMBO_TAB,
+  COMBO_ESC,
+  COMBO_DEL,
+};
+
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_right_space(
+  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,         KC_Y, KC_U,  KC_I,    KC_O,   KC_P,
+  KC_A,    KC_S,    KC_D,    KC_SF,   KC_G,         KC_H, KC_SJ, KC_K,    KC_L,   KC_ENT,
+  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,         KC_N, KC_M,  KC_COMM, KC_DOT, KC_SLSH,
+  KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, MO(_NUM_SYM),         LT(_NAV, KC_SPC)
+  ),
+
+  [_NUM_SYM] = LAYOUT_right_space(
+  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
+  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
+  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLASH,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS
+  ),
+
+  [_NAV] = LAYOUT_right_space(
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS
+  ),
+
+};
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
+  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
+
+};
+#endif
diff --git a/keyboards/nimrod/keymaps/default_right_space/readme.md b/keyboards/nimrod/keymaps/default_right_space/readme.md
new file mode 100644
index 0000000000..65e6ec80b8
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_right_space/readme.md
@@ -0,0 +1,3 @@
+# Right Space Nimrod Layout
+
+This is the layout for a right space bottom row.
diff --git a/keyboards/nimrod/keymaps/default_right_space/rules.mk b/keyboards/nimrod/keymaps/default_right_space/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_right_space/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/nimrod/keymaps/default_split_space/config.h b/keyboards/nimrod/keymaps/default_split_space/config.h
new file mode 100644
index 0000000000..ad0cd6ffdd
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_split_space/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 5
+#    define COMBO_TERM 150
+#endif
diff --git a/keyboards/nimrod/keymaps/default_split_space/keymap.c b/keyboards/nimrod/keymaps/default_split_space/keymap.c
new file mode 100644
index 0000000000..8b4fe2add0
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_split_space/keymap.c
@@ -0,0 +1,80 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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 QMK_KEYBOARD_H
+
+enum layers{
+  _BASE,
+  _NUM_SYM,
+  _NAV
+};
+
+enum combo_events {
+  COMBO_BSPC,
+  COMBO_NUMBAK,
+  COMBO_TAB,
+  COMBO_ESC,
+  COMBO_DEL,
+};
+
+#define KC_CA LCTL_T(KC_A)
+#define KC_AS LALT_T(KC_S)
+#define KC_GD LGUI_T(KC_D)
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+#define KC_GK RGUI_T(KC_K)
+#define KC_AL RALT_T(KC_L)
+#define KC_CENT RCTL_T(KC_ENT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_split_space(
+  KC_Q,  KC_W,  KC_E,  KC_R,  KC_T, KC_Y, KC_U,  KC_I,    KC_O,   KC_P,
+  KC_CA, KC_AS, KC_GD, KC_SF, KC_G, KC_H, KC_SJ, KC_GK,   KC_AL,  KC_CENT,
+  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B, KC_N, KC_M,  KC_COMM, KC_DOT, KC_SLSH,
+             LT(_NUM_SYM, KC_BSPC),               LT(_NAV, KC_SPC)
+  ),
+
+  [_NUM_SYM] = LAYOUT_split_space(
+  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
+  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
+  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLASH,
+                    KC_TRNS,                                     KC_TRNS
+  ),
+
+  [_NAV] = LAYOUT_split_space(
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                    KC_TRNS,                                     KC_TRNS
+  ),
+
+};
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
+const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
+const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
+  [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
+  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
+  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
+
+};
+#endif
diff --git a/keyboards/nimrod/keymaps/default_split_space/readme.md b/keyboards/nimrod/keymaps/default_split_space/readme.md
new file mode 100644
index 0000000000..aab94d2f03
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_split_space/readme.md
@@ -0,0 +1,3 @@
+# Split Space Nimrod Layout
+
+This is the layout for a split space bottom row.
diff --git a/keyboards/nimrod/keymaps/default_split_space/rules.mk b/keyboards/nimrod/keymaps/default_split_space/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_split_space/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/nimrod/nimrod.c b/keyboards/nimrod/nimrod.c
new file mode 100644
index 0000000000..bed03197f8
--- /dev/null
+++ b/keyboards/nimrod/nimrod.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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 "nimrod.h"
diff --git a/keyboards/nimrod/nimrod.h b/keyboards/nimrod/nimrod.h
new file mode 100644
index 0000000000..253154905c
--- /dev/null
+++ b/keyboards/nimrod/nimrod.h
@@ -0,0 +1,85 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_ortho_4x10( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39  \
+) \
+{ \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09  }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19  }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29  }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39  }  \
+}
+
+#define LAYOUT_left_space( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
+            K32,           K35, K36, K37, K38, K39  \
+) \
+{ \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09  }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19  }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29  }, \
+  { XXX, XXX, K32, XXX, XXX, K35, K36, K37, K38, K39  }  \
+}
+
+#define LAYOUT_center_space( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
+  K30, K31,           K34,           K37, K38, K39  \
+) \
+{ \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09  }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19  }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29  }, \
+  { K30, K31, XXX, XXX, K34, XXX, XXX, K37, K38, K39  }  \
+}
+
+#define LAYOUT_right_space( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
+  K30, K31, K32, K33, K34,           K37            \
+) \
+{ \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09  }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19  }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29  }, \
+  { K30, K31, K32, K33, K34, XXX, XXX, K37, XXX, XXX  }  \
+}
+
+#define LAYOUT_split_space( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
+            K32,                     K37            \
+) \
+{ \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09  }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19  }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29  }, \
+  { XXX, XXX, K32, XXX, XXX, XXX, XXX, K37, XXX, XXX  }  \
+}
diff --git a/keyboards/nimrod/readme.md b/keyboards/nimrod/readme.md
new file mode 100644
index 0000000000..3fb5724acd
--- /dev/null
+++ b/keyboards/nimrod/readme.md
@@ -0,0 +1,19 @@
+# Nimrod
+
+![Nimrod](https://i.imgur.com/OtaetJgl.jpg)
+
+The Nimrod is a 4x10 ortholinear keyboard designed by cjcodell1.
+
+* Keyboard Maintainer: [Breadtamer](https://github.com/cjcodell1)
+* Hardware Supported: [Nimrod PCB](https://github.com/cjcodell1/nimrod)
+* Hardware Availability: [Top and Bottom Plates](https://github.com/cjcodell1/nimrod)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nimrod:default
+
+Flashing example for this keyboard:
+
+    make nimrod:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/nimrod/rules.mk b/keyboards/nimrod/rules.mk
new file mode 100644
index 0000000000..05eec6a66d
--- /dev/null
+++ b/keyboards/nimrod/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = ortho_4x10