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

30 files changed, 828 insertions, 81 deletions

diff --git a/keyboards/geistmaschine/geist/geist.c b/keyboards/geistmaschine/geist/geist.c
new file mode 100644
index 0000000000..2f6825e2ee
--- /dev/null
+++ b/keyboards/geistmaschine/geist/geist.c
@@ -0,0 +1,21 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+// This will be overridden by encoder map in all default keymaps, but serves as a catch-all for user keymaps that may omit the map.
+#if defined (ENCODER_ENABLE) && !defined (ENCODER_MAP_ENABLE)
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+      return false; /* Don't process further events if user function exists and returns false */
+    }
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/geistmaschine/geist/info.json b/keyboards/geistmaschine/geist/info.json
new file mode 100644
index 0000000000..b2ae30a4a4
--- /dev/null
+++ b/keyboards/geistmaschine/geist/info.json
@@ -0,0 +1,274 @@
+{
+    "manufacturer": "Geistmaschine",
+    "keyboard_name": "Geist",
+    "maintainer": "ebastler",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": [ "D2", "D5", "D4", "D7", "B6", "C7", "F7", "F6" ],
+        "rows": [ "D6", "B4", "B5", "C6", "F0", "D3", "F5", "F4", "F1", "E6" ]
+    },
+    "processor": "atmega32u4",
+    "url": "https://geistmaschine.io/",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x676D"
+    },
+    "encoder": {
+        "rotary": [
+            { 
+                "pin_a": "B0", 
+                "pin_b": "B7",
+                "resolution": 2
+            }
+        ]
+    },
+    "community_layouts": ["65_ansi", "65_iso"],
+    "layouts": {
+        "LAYOUT_65_all": {
+            "layout": [
+              {"x":0, "y":0, "matrix":[9,1] },
+              {"x":1.25, "y":0, "matrix":[0,0] },
+              {"x":2.25, "y":0, "matrix":[1,0] },
+              {"x":3.25, "y":0, "matrix":[0,1] },
+              {"x":4.25, "y":0, "matrix":[1,1] },
+              {"x":5.25, "y":0, "matrix":[0,2] },
+              {"x":6.25, "y":0, "matrix":[1,2] },
+              {"x":7.25, "y":0, "matrix":[0,3] },
+              {"x":8.25, "y":0, "matrix":[1,3] },
+              {"x":9.25, "y":0, "matrix":[0,4] },
+              {"x":10.25, "y":0, "matrix":[1,4] },
+              {"x":11.25, "y":0, "matrix":[0,5] },
+              {"x":12.25, "y":0, "matrix":[1,5] },
+              {"x":13.25, "y":0, "matrix":[0,6] },
+              {"x":14.25, "y":0, "matrix":[1,6] },
+              {"x":15.25, "y":0, "matrix":[0,7] },
+              {"x":16.25, "y":0, "matrix":[1,7] },
+              
+              {"x":1.25, "y":1, "w":1.5, "matrix":[2,0] },
+              {"x":2.75, "y":1, "matrix":[3,0] },
+              {"x":3.75, "y":1, "matrix":[2,1] },
+              {"x":4.75, "y":1, "matrix":[3,1] },
+              {"x":5.75, "y":1, "matrix":[2,2] },
+              {"x":6.75, "y":1, "matrix":[3,2] },
+              {"x":7.75, "y":1, "matrix":[2,3] },
+              {"x":8.75, "y":1, "matrix":[3,3] },
+              {"x":9.75, "y":1, "matrix":[2,4] },
+              {"x":10.75, "y":1, "matrix":[3,4] },
+              {"x":11.75, "y":1, "matrix":[2,5] },
+              {"x":12.75, "y":1, "matrix":[3,5] },
+              {"x":13.75, "y":1, "matrix":[2,6] },
+              {"x":14.75, "y":1, "w":1.5, "matrix":[3,6] },
+              {"x":16.25, "y":1, "matrix":[3,7] },
+              
+              {"x":1.25, "y":2, "w":1.75, "matrix":[4,0] },
+              {"x":3, "y":2, "matrix":[5,0] },
+              {"x":4, "y":2, "matrix":[4,1] },
+              {"x":5, "y":2, "matrix":[5,1] },
+              {"x":6, "y":2, "matrix":[4,2] },
+              {"x":7, "y":2, "matrix":[5,2] },
+              {"x":8, "y":2, "matrix":[4,3] },
+              {"x":9, "y":2, "matrix":[5,3] },
+              {"x":10, "y":2, "matrix":[4,4] },
+              {"x":11, "y":2, "matrix":[5,4] },
+              {"x":12, "y":2, "matrix":[4,5] },
+              {"x":13, "y":2, "matrix":[5,5] },
+              {"x":14, "y":2, "matrix":[4,6] },
+              {"x":14, "y":2, "w":2.25, "matrix":[5,6] },
+              {"x":15, "y":1, "w":1.25, "h":2, "matrix":[4,7] },
+              {"x":16.25, "y":2, "matrix":[5,7] },
+      
+              {"x":1.25, "y":3, "w":1.25, "matrix":[6,0] },
+              {"x":2.5, "y":3, "matrix":[7,0] },
+              {"x":3.5, "y":3, "matrix":[6,1] },
+              {"x":4.5, "y":3, "matrix":[7,1] },
+              {"x":5.5, "y":3, "matrix":[6,2] },
+              {"x":6.5, "y":3, "matrix":[7,2] },
+              {"x":7.5, "y":3, "matrix":[6,3] },
+              {"x":8.5, "y":3, "matrix":[7,3] },
+              {"x":9.5, "y":3, "matrix":[6,4] },
+              {"x":10.5, "y":3, "matrix":[7,4] },
+              {"x":11.5, "y":3, "matrix":[6,5] },
+              {"x":12.5, "y":3, "matrix":[7,5] },
+              {"x":13.5, "y":3, "w":1.75, "matrix":[6,6] },
+              {"x":15.25, "y":3, "matrix":[6,7] },
+              {"x":16.25, "y":3, "matrix":[7,7] },
+              
+              {"x":1.25, "y":4, "w":1.25, "matrix":[8,0] },
+              {"x":2.5, "y":4, "w":1.25, "matrix":[9,0] },
+              {"x":3.75, "y":4, "w":1.25, "matrix":[8,1] },
+              {"x":5, "y":4, "w":2.25, "matrix":[8,2] },
+              {"x":7.25, "y":4, "w":1.25, "matrix":[8,3] },
+              {"x":8.5, "y":4, "w":2.75, "matrix":[8,4] },
+              {"x":11.25, "y":4, "w":1.25, "matrix":[8,5] },
+              {"x":12.5, "y":4, "w":1.25, "matrix":[9,5] },
+              {"x":14.25, "y":4, "matrix":[9,6] },
+              {"x":15.25, "y":4, "matrix":[8,7] },
+              {"x":16.25, "y":4, "matrix":[9,7] }
+            ]
+        },
+        "LAYOUT_65_ansi": {
+            "layout": [
+              {"x":0, "y":0, "matrix":[9,1] },
+              {"x":1.25, "y":0, "matrix":[0,0] },
+              {"x":2.25, "y":0, "matrix":[1,0] },
+              {"x":3.25, "y":0, "matrix":[0,1] },
+              {"x":4.25, "y":0, "matrix":[1,1] },
+              {"x":5.25, "y":0, "matrix":[0,2] },
+              {"x":6.25, "y":0, "matrix":[1,2] },
+              {"x":7.25, "y":0, "matrix":[0,3] },
+              {"x":8.25, "y":0, "matrix":[1,3] },
+              {"x":9.25, "y":0, "matrix":[0,4] },
+              {"x":10.25, "y":0, "matrix":[1,4] },
+              {"x":11.25, "y":0, "matrix":[0,5] },
+              {"x":12.25, "y":0, "matrix":[1,5] },
+              {"x":13.25, "y":0, "matrix":[0,6] },
+              {"x":14.25, "y":0, "w":2, "matrix":[0,7] },
+              {"x":16.25, "y":0, "matrix":[1,7] },
+        
+              {"x":1.25, "y":1, "w":1.5, "matrix":[2,0] },
+              {"x":2.75, "y":1, "matrix":[3,0] },
+              {"x":3.75, "y":1, "matrix":[2,1] },
+              {"x":4.75, "y":1, "matrix":[3,1] },
+              {"x":5.75, "y":1, "matrix":[2,2] },
+              {"x":6.75, "y":1, "matrix":[3,2] },
+              {"x":7.75, "y":1, "matrix":[2,3] },
+              {"x":8.75, "y":1, "matrix":[3,3] },
+              {"x":9.75, "y":1, "matrix":[2,4] },
+              {"x":10.75, "y":1, "matrix":[3,4] },
+              {"x":11.75, "y":1, "matrix":[2,5] },
+              {"x":12.75, "y":1, "matrix":[3,5] },
+              {"x":13.75, "y":1, "matrix":[2,6] },
+              {"x":14.75, "y":1, "w":1.5, "matrix":[3,6] },
+              {"x":16.25, "y":1, "matrix":[3,7] },
+        
+              {"x":1.25, "y":2, "w":1.75, "matrix":[4,0] },
+              {"x":3, "y":2, "matrix":[5,0] },
+              {"x":4, "y":2, "matrix":[4,1] },
+              {"x":5, "y":2, "matrix":[5,1] },
+              {"x":6, "y":2, "matrix":[4,2] },
+              {"x":7, "y":2, "matrix":[5,2] },
+              {"x":8, "y":2, "matrix":[4,3] },
+              {"x":9, "y":2, "matrix":[5,3] },
+              {"x":10, "y":2, "matrix":[4,4] },
+              {"x":11, "y":2, "matrix":[5,4] },
+              {"x":12, "y":2, "matrix":[4,5] },
+              {"x":13, "y":2, "matrix":[5,5] },
+              {"x":14, "y":2, "w":2.25, "matrix":[5,6] },
+              {"x":16.25, "y":2, "matrix":[5,7] },
+
+              {"x":1.25, "y":3, "w":2.25, "matrix":[6,0] },
+              {"x":3.5, "y":3, "matrix":[6,1] },
+              {"x":4.5, "y":3, "matrix":[7,1] },
+              {"x":5.5, "y":3, "matrix":[6,2] },
+              {"x":6.5, "y":3, "matrix":[7,2] },
+              {"x":7.5, "y":3, "matrix":[6,3] },
+              {"x":8.5, "y":3, "matrix":[7,3] },
+              {"x":9.5, "y":3, "matrix":[6,4] },
+              {"x":10.5, "y":3, "matrix":[7,4] },
+              {"x":11.5, "y":3, "matrix":[6,5] },
+              {"x":12.5, "y":3, "matrix":[7,5] },
+              {"x":13.5, "y":3, "w":1.75, "matrix":[6,6] },
+              {"x":15.25, "y":3, "matrix":[6,7] },
+              {"x":16.25, "y":3, "matrix":[7,7] },
+        
+              {"x":1.25, "y":4, "w":1.25, "matrix":[8,0] },
+              {"x":2.5, "y":4, "w":1.25, "matrix":[9,0] },
+              {"x":3.75, "y":4, "w":1.25, "matrix":[8,1] },
+              {"x":5, "y":4, "w":6.25, "matrix":[8,3] },
+              {"x":11.25, "y":4, "w":1.25, "matrix":[8,5] },
+              {"x":12.5, "y":4, "w":1.25, "matrix":[9,5] },
+              {"x":14.25, "y":4, "matrix":[9,6] },
+              {"x":15.25, "y":4, "matrix":[8,7] },
+              {"x":16.25, "y":4, "matrix":[9,7] }
+          ]
+        },
+        "LAYOUT_65_iso": {
+          "layout": [
+              {"x":0, "y":0, "matrix":[9,1] },
+              {"x":1.25, "y":0, "matrix":[0,0] },
+              {"x":2.25, "y":0, "matrix":[1,0] },
+              {"x":3.25, "y":0, "matrix":[0,1] },
+              {"x":4.25, "y":0, "matrix":[1,1] },
+              {"x":5.25, "y":0, "matrix":[0,2] },
+              {"x":6.25, "y":0, "matrix":[1,2] },
+              {"x":7.25, "y":0, "matrix":[0,3] },
+              {"x":8.25, "y":0, "matrix":[1,3] },
+              {"x":9.25, "y":0, "matrix":[0,4] },
+              {"x":10.25, "y":0, "matrix":[1,4] },
+              {"x":11.25, "y":0, "matrix":[0,5] },
+              {"x":12.25, "y":0, "matrix":[1,5] },
+              {"x":13.25, "y":0, "matrix":[0,6] },
+              {"x":14.25, "y":0, "w":2, "matrix":[0,7] },
+              {"x":16.25, "y":0, "matrix":[1,7] },
+        
+              {"x":1.25, "y":1, "w":1.5, "matrix":[2,0] },
+              {"x":2.75, "y":1, "matrix":[3,0] },
+              {"x":3.75, "y":1, "matrix":[2,1] },
+              {"x":4.75, "y":1, "matrix":[3,1] },
+              {"x":5.75, "y":1, "matrix":[2,2] },
+              {"x":6.75, "y":1, "matrix":[3,2] },
+              {"x":7.75, "y":1, "matrix":[2,3] },
+              {"x":8.75, "y":1, "matrix":[3,3] },
+              {"x":9.75, "y":1, "matrix":[2,4] },
+              {"x":10.75, "y":1, "matrix":[3,4] },
+              {"x":11.75, "y":1, "matrix":[2,5] },
+              {"x":12.75, "y":1, "matrix":[3,5] },
+              {"x":13.75, "y":1, "matrix":[2,6] },
+              {"x":16.25, "y":1, "matrix":[3,7] },
+        
+              {"x":1.25, "y":2, "w":1.75, "matrix":[4,0] },
+              {"x":3, "y":2, "matrix":[5,0] },
+              {"x":4, "y":2, "matrix":[4,1] },
+              {"x":5, "y":2, "matrix":[5,1] },
+              {"x":6, "y":2, "matrix":[4,2] },
+              {"x":7, "y":2, "matrix":[5,2] },
+              {"x":8, "y":2, "matrix":[4,3] },
+              {"x":9, "y":2, "matrix":[5,3] },
+              {"x":10, "y":2, "matrix":[4,4] },
+              {"x":11, "y":2, "matrix":[5,4] },
+              {"x":12, "y":2, "matrix":[4,5] },
+              {"x":13, "y":2, "matrix":[5,5] },
+              {"x":14, "y":2, "matrix":[4,6] },
+              {"x":15, "y":1, "w":1.25, "h":2, "matrix":[4,7] },
+              {"x":16.25, "y":2, "matrix":[5,7] },
+
+              {"x":1.25, "y":3, "w":1.25, "matrix":[6,0] },
+              {"x":2.5, "y":3, "matrix":[7,0] },
+              {"x":3.5, "y":3, "matrix":[6,1] },
+              {"x":4.5, "y":3, "matrix":[7,1] },
+              {"x":5.5, "y":3, "matrix":[6,2] },
+              {"x":6.5, "y":3, "matrix":[7,2] },
+              {"x":7.5, "y":3, "matrix":[6,3] },
+              {"x":8.5, "y":3, "matrix":[7,3] },
+              {"x":9.5, "y":3, "matrix":[6,4] },
+              {"x":10.5, "y":3, "matrix":[7,4] },
+              {"x":11.5, "y":3, "matrix":[6,5] },
+              {"x":12.5, "y":3, "matrix":[7,5] },
+              {"x":13.5, "y":3, "w":1.75, "matrix":[6,6] },
+              {"x":15.25, "y":3, "matrix":[6,7] },
+              {"x":16.25, "y":3, "matrix":[7,7] },
+        
+              {"x":1.25, "y":4, "w":1.25, "matrix":[8,0] },
+              {"x":2.5, "y":4, "w":1.25, "matrix":[9,0] },
+              {"x":3.75, "y":4, "w":1.25, "matrix":[8,1] },
+              {"x":5, "y":4, "w":6.25, "matrix":[8,3] },
+              {"x":11.25, "y":4, "w":1.25, "matrix":[8,5] },
+              {"x":12.5, "y":4, "w":1.25, "matrix":[9,5] },
+              {"x":14.25, "y":4, "matrix":[9,6] },
+              {"x":15.25, "y":4, "matrix":[8,7] },
+              {"x":16.25, "y":4, "matrix":[9,7] }
+          ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/geistmaschine/geist/keymaps/ansi/keymap.c b/keyboards/geistmaschine/geist/keymaps/ansi/keymap.c
new file mode 100644
index 0000000000..0fe02a4d3b
--- /dev/null
+++ b/keyboards/geistmaschine/geist/keymaps/ansi/keymap.c
@@ -0,0 +1,62 @@
+/* Copyright 2023 Moritz Plattner
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* ┌───┐
+     * │ENC│ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * └───┘ │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Hom│
+     *       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     *       │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │PgU│
+     *       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     *       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │PgD│
+     *       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     *       │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
+     *       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     *       │Ctrl│GUI │Alt │                        │Alt │GUI │ │ ← │ ↓ │ → │
+     *       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_65_ansi(
+        LT(2, KC_MUTE), KC_GRV,  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_DEL,
+                        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_BSLS, KC_HOME,
+                        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_ENT,  KC_PGUP,
+                        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,        KC_RSFT, KC_UP,   KC_PGDN,
+                        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, LT(1, KC_RGUI), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi(
+        KC_MPLY,        KC_ESC,  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_INS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_HOME,
+                        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_ON,   NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
+                        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_65_ansi(
+        KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+                        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) },
+    [2] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/geistmaschine/geist/keymaps/ansi/rules.mk b/keyboards/geistmaschine/geist/keymaps/ansi/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/geistmaschine/geist/keymaps/ansi/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/geistmaschine/geist/keymaps/default/keymap.c b/keyboards/geistmaschine/geist/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1d44469c4e
--- /dev/null
+++ b/keyboards/geistmaschine/geist/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2023 Moritz Plattner
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_65_all(
+        LT(2, KC_MUTE), KC_GRV,  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_DEL,
+                        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_BSLS,          KC_HOME,
+                        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, KC_ENT,  KC_ENT,  KC_PGUP,
+                        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,        KC_RSFT, KC_UP,            KC_PGDN,
+                        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, LT(1, KC_RGUI), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_all(
+        KC_MPLY,        KC_ESC,  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_INS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PSCR,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_ON,   NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_END,
+                        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          MO(2),   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+    ),
+    [2] = LAYOUT_65_all(
+        KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+                        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) },
+    [2] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/geistmaschine/geist/keymaps/default/rules.mk b/keyboards/geistmaschine/geist/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/geistmaschine/geist/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/geistmaschine/geist/keymaps/iso/keymap.c b/keyboards/geistmaschine/geist/keymaps/iso/keymap.c
new file mode 100644
index 0000000000..6d08161d3b
--- /dev/null
+++ b/keyboards/geistmaschine/geist/keymaps/iso/keymap.c
@@ -0,0 +1,62 @@
+/* Copyright 2023 Moritz Plattner
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* ┌───┐
+     * │ENC│ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * └───┘ │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Hom│
+     *       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     *       │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Enter│PgU│
+     *       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
+     *       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PgD│
+     *       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+     *       │Shft│|\ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
+     *       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     *       │Ctrl│GUI │Alt │                        │Alt │GUI │ │ ← │ ↓ │ → │
+     *       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_65_iso(
+        LT(2, KC_MUTE), KC_GRV,  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_DEL,
+                        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_HOME,
+                        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, KC_ENT,  KC_PGUP,
+                        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,        KC_RSFT, KC_UP,   KC_PGDN,
+                        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, LT(1, KC_RGUI), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_iso(
+        KC_MPLY,        KC_ESC,  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_INS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PSCR,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_ON,   NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
+                        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_65_iso(
+        KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) },
+    [2] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/geistmaschine/geist/keymaps/iso/rules.mk b/keyboards/geistmaschine/geist/keymaps/iso/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/geistmaschine/geist/keymaps/iso/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/geistmaschine/geist/keymaps/via/keymap.c b/keyboards/geistmaschine/geist/keymaps/via/keymap.c
new file mode 100644
index 0000000000..94d2624392
--- /dev/null
+++ b/keyboards/geistmaschine/geist/keymaps/via/keymap.c
@@ -0,0 +1,58 @@
+/* Copyright 2023 Moritz Plattner
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_65_all(
+        LT(2, KC_MUTE), KC_GRV,  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_DEL,
+                        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_BSLS,          KC_HOME,
+                        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, KC_ENT,  KC_ENT,  KC_PGUP,
+                        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,        KC_RSFT, KC_UP,            KC_PGDN,
+                        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, LT(1, KC_RGUI), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_all(
+        KC_MPLY,        KC_ESC,  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_INS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PSCR,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_ON,   NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_END,
+                        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          MO(2),   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+    ),
+    [2] = LAYOUT_65_all(
+        KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_