[Keyboard] Neito + my DZ60 keymap tweaks (#11773)

11 files changed, 726 insertions, 0 deletions

diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h
new file mode 100644
index 0000000000..c638b800c4
--- /dev/null
+++ b/keyboards/neito/config.h
@@ -0,0 +1,58 @@
+/* Copyright 2021 Oliver Granlund
+ *
+ * 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       0xB9F7 // "Oliver Granlund"
+#define PRODUCT_ID      0xB44C // "Neito"
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Oliver Granlund
+#define PRODUCT         Neito
+
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+#define MATRIX_ROW_PINS { E6, F0, F5, F6, C7, C6, B4, D7, D6, D4 }
+#define MATRIX_COL_PINS { F4, F1, F7, B2, D1, D2, B3, B1 }
+
+#define DIODE_DIRECTION COL2ROW
+#define ENCODERS_PAD_A { B7 }
+#define ENCODERS_PAD_B { B0 }
+#define ENCODER_RESOLUTION 4
+#define UNUSED_PINS
+
+#define LED_CAPS_LOCK_PIN B6
+#define BACKLIGHT_ON_STATE  0
+
+#define BACKLIGHT_PIN B5
+#define BACKLIGHT_LEVELS 5
+
+#define GRAVE_ESC_CTRL_OVERRIDE
+
+/* RGB Light Configuration */
+
+#define RGB_DI_PIN D5
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 11
+#define RGBLIGHT_LED_MAP { 4, 3, 2, 1, 0, 10, 9, 8, 7, 6, 5 }
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 200
+
+/* Handle volume control issue with rotary encoder */
+
+#define TAP_CODE_DELAY 10
diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json
new file mode 100644
index 0000000000..92900051a1
--- /dev/null
+++ b/keyboards/neito/info.json
@@ -0,0 +1,365 @@
+{
+   "keyboard_name":"Neito",
+   "url":"olli.works",
+   "maintainer":"Oliver Granlund",
+   "width":20.69,
+   "height":14.755,
+   "layouts":{
+      "LAYOUT":{
+         "layout":[
+            {
+               "label":"0,7",
+               "x":19.19,
+               "y":0
+            },
+            {
+               "label":"0,1",
+               "x":2.62,
+               "y":0.19
+            },
+            {
+               "label":"1,5",
+               "x":14.94,
+               "y":0.19
+            },
+            {
+               "label":"0,0",
+               "x":0.62,
+               "y":0.25
+            },
+            {
+               "label":"1,0",
+               "x":1.62,
+               "y":0.25
+            },
+            {
+               "label":"0,6",
+               "x":15.94,
+               "y":0.25
+            },
+            {
+               "label":"1,6",
+               "x":16.94,
+               "y":0.25,
+               "w":2
+            },
+            {
+               "label":"1,1",
+               "x":4,
+               "y":0.44
+            },
+            {
+               "label":"0,2",
+               "x":5,
+               "y":0.44
+            },
+            {
+               "label":"1,2",
+               "x":6,
+               "y":0.44
+            },
+            {
+               "label":"0,3",
+               "x":7,
+               "y":0.44
+            },
+            {
+               "label":"1,3",
+               "x":10.25,
+               "y":0.44
+            },
+            {
+               "label":"0,4",
+               "x":11.25,
+               "y":0.44
+            },
+            {
+               "label":"1,4",
+               "x":12.25,
+               "y":0.44
+            },
+            {
+               "label":"0,5",
+               "x":13.25,
+               "y":0.44
+            },
+            {
+               "label":"2,7",
+               "x":19.44,
+               "y":1
+            },
+            {
+               "label":"2,0",
+               "x":0.43,
+               "y":1.25,
+               "w":1.5
+            },
+            {
+               "label":"3,0",
+               "x":1.93,
+               "y":1.25
+            },
+            {
+               "label":"3,5",
+               "x":15.69,
+               "y":1.25
+            },
+            {
+               "label":"2,6",
+               "x":16.69,
+               "y":1.25
+            },
+            {
+               "label":"3,6",
+               "x":17.94,
+               "y":1.25,
+               "w":1.25,
+               "h":2
+            },
+            {
+               "label":"2,1",
+               "x":3.5,
+               "y":1.44
+            },
+            {
+               "label":"3,1",
+               "x":4.5,
+               "y":1.44
+            },
+            {
+               "label":"2,2",
+               "x":5.5,
+               "y":1.44
+            },
+            {
+               "label":"3,2",
+               "x":6.5,
+               "y":1.44
+            },
+            {
+               "label":"2,3",
+               "x":9.75,
+               "y":1.44
+            },
+            {
+               "label":"3,3",
+               "x":10.75,
+               "y":1.44
+            },
+            {
+               "label":"2,4",
+               "x":11.75,
+               "y":1.44
+            },
+            {
+               "label":"3,4",
+               "x":12.75,
+               "y":1.44
+            },
+            {
+               "label":"2,5",
+               "x":13.75,
+               "y":1.44
+            },
+            {
+               "label":"4,7",
+               "x":19.69,
+               "y":2.0
+            },
+            {
+               "label":"4,0",
+               "x":0.18,
+               "y":2.25,
+               "w":1.75
+            },
+            {
+               "label":"5,0",
+               "x":1.93,
+               "y":2.25
+            },
+            {
+               "label":"4,5",
+               "x":14.94,
+               "y":2.25
+            },
+            {
+               "label":"5,5",
+               "x":15.94,
+               "y":2.25
+            },
+            {
+               "label":"4,6",
+               "x":16.94,
+               "y":2.25
+            },
+            {
+               "label":"4,1",
+               "x":3.75,
+               "y":2.44
+            },
+            {
+               "label":"5,1",
+               "x":4.75,
+               "y":2.44
+            },
+            {
+               "label":"4,2",
+               "x":5.75,
+               "y":2.44
+            },
+            {
+               "label":"5,2",
+               "x":6.75,
+               "y":2.44
+            },
+            {
+               "label":"4,3",
+               "x":10,
+               "y":2.44
+            },
+            {
+               "label":"5,3",
+               "x":11,
+               "y":2.44
+            },
+            {
+               "label":"4,4",
+               "x":12,
+               "y":2.44
+            },
+            {
+               "label":"5,4",
+               "x":13,
+               "y":2.44
+            },
+            {
+               "label":"6,0",
+               "x":0,
+               "y":3.25,
+               "w":1.25
+            },
+            {
+               "label":"8,0",
+               "x":1.25,
+               "y":3.25
+            },
+            {
+               "label":"7,0",
+               "x":2.25,
+               "y":3.25
+            },
+            {
+               "label":"6,5",
+               "x":15.44,
+               "y":3.25
+            },
+            {
+               "label":"6,6",
+               "x":16.44,
+               "y":3.25,
+               "w":1.75
+            },
+            {
+               "label":"6,1",
+               "x":4.25,
+               "y":3.44
+            },
+            {
+               "label":"7,1",
+               "x":5.25,
+               "y":3.44
+            },
+            {
+               "label":"6,2",
+               "x":6.25,
+               "y":3.44
+            },
+            {
+               "label":"7,2",
+               "x":7.25,
+               "y":3.44
+            },
+            {
+               "label":"8,3",
+               "x":9.25,
+               "y":3.44
+            },
+            {
+               "label":"6,3",
+               "x":10.25,
+               "y":3.44
+            },
+            {
+               "label":"7,3",
+               "x":11.25,
+               "y":3.44
+            },
+            {
+               "label":"6,4",
+               "x":12.25,
+               "y":3.44
+            },
+            {
+               "label":"7,4",
+               "x":13.25,
+               "y":3.44
+            },
+            {
+               "label":"7,6",
+               "x":18.44,
+               "y":3.5
+            },
+            {
+               "label":"9,0",
+               "x":0,
+               "y":4.25,
+               "w":1.5
+            },
+            {
+               "label":"8,1",
+               "x":4.25,
+               "y":4.44,
+               "w":1.5
+            },
+            {
+               "label":"8,2",
+               "x":5.75,
+               "y":4.44,
+               "w":2
+            },
+            {
+               "label":"9,2",
+               "x":7.75,
+               "y":4.44
+            },
+            {
+               "label":"9,3",
+               "x":9.75,
+               "y":4.44,
+               "w":2.75
+            },
+            {
+               "label":"8,4",
+               "x":12.5,
+               "y":4.44,
+               "w":1.5
+            },
+            {
+               "label":"8,6",
+               "x":17.44,
+               "y":4.5
+            },
+            {
+               "label":"9,6",
+               "x":18.44,
+               "y":4.5
+            },
+            {
+               "label":"8,7",
+               "x":19.44,
+               "y":4.5
+            }
+         ]
+      }
+   }
+}
\ No newline at end of file
diff --git a/keyboards/neito/keymaps/default/keymap.c b/keyboards/neito/keymaps/default/keymap.c
new file mode 100644
index 0000000000..47e84d5838
--- /dev/null
+++ b/keyboards/neito/keymaps/default/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2020 Oliver Granlund
+ *
+ * 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 {
+  _DEFAULT,
+  _FN0,
+  _FN1,
+  _FN2,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_DEFAULT] = LAYOUT(
+        KC_GESC, KC_1, KC_2,      KC_3, KC_4, KC_5, KC_6,                    KC_7, KC_8, KC_9, KC_0,                      KC_MINS, KC_EQL, KC_BSPC,                KC_MUTE,
+        KC_TAB, KC_Q,             KC_W, KC_E, KC_R, KC_T,                    KC_Y, KC_U, KC_I, KC_O, KC_P,                  KC_LBRC, KC_RBRC, KC_ENT,              MO(_FN0),
+        KC_CAPS, KC_A,            KC_S, KC_D, KC_F, KC_G,                    KC_H, KC_J, KC_K, KC_L,                          KC_SCLN, KC_QUOT, KC_NUHS,           MO(_FN1),
+        KC_LSFT, KC_NUBS, KC_Z,   KC_X, KC_C, KC_V, KC_B,              KC_B, KC_N, KC_M, KC_COMM, KC_DOT,                       KC_SLSH, KC_RSFT,         KC_UP,
+        KC_LCTL,                  KC_LALT, KC_SPC, KC_SPC,                   KC_SPC, KC_RALT,                                                    KC_LEFT, KC_DOWN,  KC_RGHT
+    ),
+    [_FN0] = LAYOUT(
+        KC_GRV, KC_F1, KC_F2,       KC_F3, KC_F4, KC_F5, KC_F6,                    KC_F7, KC_F8, KC_F9, KC_F10,                   KC_F11, KC_F12, KC_DEL,                   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, 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, 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,                                                     KC_TRNS, KC_TRNS,  KC_TRNS
+    ),
+    [_FN1] = LAYOUT(
+        KC_TRNS, RGB_TOG, RGB_MOD,  RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI,           RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,            KC_TRNS, KC_TRNS, KC_DEL,                 KC_TRNS,
+        KC_TRNS, KC_MPRV,           KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,            BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,              RESET,
+        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,  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, KC_TRNS,                                                     KC_TRNS, KC_TRNS,  KC_TRNS
+    ),
+    [_FN2] = LAYOUT(
+        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,           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, 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,   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
+    ),
+};
+
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+      tap_code(KC_VOLU);
+    } else {
+      tap_code(KC_VOLD);
+    }
+
+    return true;
+};
diff --git a/keyboards/neito/keymaps/olli_works/keymap.c b/keyboards/neito/keymaps/olli_works/keymap.c
new file mode 100644
index 0000000000..31763e1169
--- /dev/null
+++ b/keyboards/neito/keymaps/olli_works/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2020 Oliver Granlund
+ *
+ * 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 {
+  _DEFAULT,
+  _MAC,
+  _FN1,
+  _FN2,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_DEFAULT] = LAYOUT(
+        KC_GESC, KC_1, KC_2,      KC_3, KC_4, KC_5, KC_6,                    KC_7, KC_8, KC_9, KC_0,                        KC_MINS, KC_EQL, KC_BSPC,              KC_MUTE,
+        KC_TAB, KC_Q,             KC_W, KC_E, KC_R, KC_T,                    KC_Y, KC_U, KC_I, KC_O, KC_P,                  KC_LBRC, KC_RBRC, KC_ENT,              TG(_MAC),
+        MO(_FN1), KC_A,           KC_S, KC_D, KC_F, KC_G,                    KC_H, KC_J, KC_K, KC_L,                          KC_SCLN, KC_QUOT, KC_NUHS,           MO(_FN2),
+        KC_LSFT, KC_NUBS, KC_Z,   KC_X, KC_C, KC_V, KC_B,              KC_B, KC_N, KC_M, KC_COMM, KC_DOT,                       KC_SLSH, KC_RSFT,         KC_UP,
+        KC_LCTL,                  KC_LALT, KC_SPC, KC_SPC,                   KC_SPC, KC_RALT,                                                    KC_LEFT, KC_DOWN,  KC_RGHT
+    ),
+    [_MAC] = LAYOUT(
+        KC_ESC, KC_1, KC_2,       KC_3, KC_4, KC_5, KC_6,                    KC_7, KC_8, KC_9, KC_0,                        KC_MINS, KC_EQL, KC_BSPC,              KC_TRNS,
+        KC_TAB, KC_Q,             KC_W, KC_E, KC_R, KC_T,                    KC_Y, KC_U, KC_I, KC_O, KC_P,                  KC_LBRC, KC_RBRC, KC_ENT,              KC_TRNS,
+        MO(_FN1), KC_A,           KC_S, KC_D, KC_F, KC_G,                    KC_H, KC_J, KC_K, KC_L,                          KC_SCLN, KC_QUOT, KC_NUHS,           MO(_FN2),
+        KC_LSFT, KC_NUBS, KC_Z,   KC_X, KC_C, KC_V, KC_B,              KC_B, KC_N, KC_M, KC_COMM, KC_DOT,                       KC_SLSH, KC_RSFT,         KC_UP,
+        KC_LGUI,                  KC_LALT, KC_SPC, KC_LCTL,                  KC_SPC, KC_RALT,                                                    KC_LEFT, KC_DOWN,  KC_RGHT
+    ),
+    [_FN1] = LAYOUT(
+        KC_GRV, KC_F1, KC_F2,      KC_F3, KC_F4, KC_F5, KC_F6,                     KC_F7, KC_F8, KC_F9, KC_F10,                 KC_F11, KC_F12, KC_DEL,                  KC_TRNS,
+        KC_TRNS, KC_MPRV,          KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,             KC_TRNS, KC_PGDN, KC_UP,   KC_PGUP, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,             KC_PSCR,
+        KC_TRNS, KC_TRNS,          KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,             KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT,              KC_TRNS, KC_TRNS, KC_TRNS,           KC_CAPS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LGUI, 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, KC_TRNS,  KC_TRNS
+    ),
+    [_FN2] = LAYOUT(
+        KC_ESC, RGB_TOG, RGB_MOD,   RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI,           RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,            KC_TRNS, KC_TRNS, KC_DEL,               KC_TRNS,
+        KC_TRNS, KC_MPRV,           KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,            BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,            RESET,
+        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,  KC_TRNS, KC_LGUI, 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, KC_TRNS,  KC_TRNS
+    ),
+};
+
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+      tap_code(KC_VOLU);
+    } else {
+      tap_code(KC_VOLD);
+    }
+
+    return true;
+};
diff --git a/keyboards/neito/keymaps/olli_works/rules.mk b/keyboards/neito/keymaps/olli_works/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/neito/keymaps/olli_works/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/neito/keymaps/via/keymap.c b/keyboards/neito/keymaps/via/keymap.c
new file mode 100644
index 0000000000..47e84d5838
--- /dev/null
+++ b/keyboards/neito/keymaps/via/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2020 Oliver Granlund
+ *
+ * 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 {
+  _DEFAULT,
+  _FN0,
+  _FN1,
+  _FN2,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_DEFAULT] = LAYOUT(
+        KC_GESC, KC_1, KC_2,      KC_3, KC_4, KC_5, KC_6,                    KC_7, KC_8, KC_9, KC_0,                      KC_MINS, KC_EQL, KC_BSPC,                KC_MUTE,
+        KC_TAB, KC_Q,             KC_W, KC_E, KC_R, KC_T,                    KC_Y, KC_U, KC_I, KC_O, KC_P,                  KC_LBRC, KC_RBRC, KC_ENT,              MO(_FN0),
+        KC_CAPS, KC_A,            KC_S, KC_D, KC_F, KC_G,                    KC_H, KC_J, KC_K, KC_L,                          KC_SCLN, KC_QUOT, KC_NUHS,           MO(_FN1),
+        KC_LSFT, KC_NUBS, KC_Z,   KC_X, KC_C, KC_V, KC_B,              KC_B, KC_N, KC_M, KC_COMM, KC_DOT,                       KC_SLSH, KC_RSFT,         KC_UP,
+        KC_LCTL,                  KC_LALT, KC_SPC, KC_SPC,                   KC_SPC, KC_RALT,                                                    KC_LEFT, KC_DOWN,  KC_RGHT
+    ),
+    [_FN0] = LAYOUT(
+        KC_GRV, KC_F1, KC_F2,       KC_F3, KC_F4, KC_F5, KC_F6,                    KC_F7, KC_F8, KC_F9, KC_F10,                   KC_F11, KC_F12, KC_DEL,                   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, 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, 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,                                                     KC_TRNS, KC_TRNS,  KC_TRNS
+    ),
+    [_FN1] = LAYOUT(
+        KC_TRNS, RGB_TOG, RGB_MOD,  RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI,           RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,            KC_TRNS, KC_TRNS, KC_DEL,                 KC_TRNS,
+        KC_TRNS, KC_MPRV,           KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,            BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,              RESET,
+        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,  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, KC_TRNS,                                                     KC_TRNS, KC_TRNS,  KC_TRNS
+    ),
+    [_FN2] = LAYOUT(
+        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,           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, 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,   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
+    ),
+};
+
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+      tap_code(KC_VOLU);
+    } else {
+      tap_code(KC_VOLD);
+    }
+
+    return true;
+};
diff --git a/keyboards/neito/keymaps/via/rules.mk b/keyboards/neito/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/neito/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/neito/neito.c b/keyboards/neito/neito.c
new file mode 100644
index 0000000000..a05831ec17
--- /dev/null
+++ b/keyboards/neito/neito.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Oliver Granlund
+ *
+ * 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 "neito.h"
diff --git a/keyboards/neito/neito.h b/keyboards/neito/neito.h
new file mode 100644
index 0000000000..35f1df2862
--- /dev/null
+++ b/keyboards/neito/neito.h
@@ -0,0 +1,37 @@
+/* Copyright 2020 Oliver Granlund
+ *
+ * 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 LAYOUT( \
+    k00, k10, k01, k11, k02, k12, k03,      k13, k04, k14, k05,  k15,  k06, k16,  k07, \
+    k20, k30, k21, k31, k22, k32, k23,      k33, k24, k34, k25,  k35,  k26, k36,  k27, \
+    k40, k50, k41, k51, k42, k52, k43,      k53, k44, k54, k45,  k55,  k46,       k47, \
+    k60, k80, k70, k61, k71, k62, k72, k83, k63, k73, k64, k74,  k65,  k66, k76,       \
+    k90,      k81,      k82, k92, k93,      k84,                       k86, k96,  k87  \
+) { \
+    { k00, k01,   k02, k03, k04,   k05,   k06,   k07 }, \
+    { k10, k11,   k12, k13, k14,   k15,   k16,   KC_NO }, \
+    { k20, k21,   k22, k23, k24,   k25,   k26,   k27 }, \
+    { k30, k31,   k32, k33, k34,   k35,   k36,   KC_NO }, \
+    { k40, k41,   k42, k43, k44,   k45,   k46,   k47 }, \
+    { k50, k51,   k52, k53, k54,   k55,   KC_NO, KC_NO }, \
+    { k60, k61,   k62, k63, k64,   k65,   k66,   KC_NO }, \
+    { k70, k71,   k72, k73, k74,   KC_NO, k76,   KC_NO }, \
+    { k80, k81,   k82, k83, k84,   KC_NO, k86,   k87 }, \
+    { k90, KC_NO, k92, k93, KC_NO, KC_NO, k96,   KC_NO }, \
+}
diff --git a/keyboards/neito/readme.md b/keyboards/neito/readme.md
new file mode 100644
index 0000000000..eec96d3341
--- /dev/null
+++ b/keyboards/neito/readme.md
@@ -0,0 +1,24 @@
+# Neito
+### by Oliver Granlund
+
+ISO-variant of TGR Alice with a few tweaks!
+
+![First prototype](https://i.imgur.com/GbZAnIpl.jpg)
+
+![First prototypes backside](https://i.imgur.com/h7Hx6EUl.jpg)
+
+* Keyboard Maintainer: [Oliver Granlund](https://github.com/OlliGranlund)
+* Hardware Supported: Neito PCB (ATmega32U4)
+* Hardware Availability: Group Buys hosted on [https://olli.works](https://olli.works)
+
+Getting the board into bootloader mode:
+
+To be able to flash firmware onto this board, you'll need to bring the keyboard into bootloader mode. The keyboard has a debug-panel located between the keys "H" and "N". In this 2x3-panel, short the two pins which are furthest away from the atmega32u4 microcontroller. See the red arrows in the image below.
+
+![Reset pins](https://i.imgur.com/fN2XjY8l.jpg)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make neito:default
+
+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/neito/rules.mk b/keyboards/neito/rules.mk
new file mode 100644
index 0000000000..b16bff3285
--- /dev/null
+++ b/keyboards/neito/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # 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 = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # We have a encoder