summaryrefslogtreecommitdiff
path: root/keyboards/atreus
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/atreus')
-rw-r--r--keyboards/atreus/keymaps/clash/keymap.c8
-rw-r--r--keyboards/atreus/keymaps/default/keymap.c2
-rw-r--r--keyboards/atreus/keymaps/dvorak_42_key/keymap.c10
-rw-r--r--keyboards/atreus/keymaps/erlandsona/keymap.c2
-rw-r--r--keyboards/atreus/keymaps/henxing/keymap.c2
-rw-r--r--keyboards/atreus/keymaps/nojjan/keymap.c2
-rw-r--r--keyboards/atreus/keymaps/ptillemans/keymap.c2
-rw-r--r--keyboards/atreus/keymaps/via/keymap.c2
-rw-r--r--keyboards/atreus/keymaps/workman/keymap.c6
-rw-r--r--keyboards/atreus/keymaps/xk/config.h36
-rw-r--r--keyboards/atreus/keymaps/xk/keymap.c311
-rw-r--r--keyboards/atreus/keymaps/xk/rules.mk15
-rw-r--r--keyboards/atreus/keymaps/xyverz/keymap.c2
-rw-r--r--keyboards/atreus/keymaps/yttyx/keymap.c2
14 files changed, 20 insertions, 382 deletions
diff --git a/keyboards/atreus/keymaps/clash/keymap.c b/keyboards/atreus/keymaps/clash/keymap.c
index 9a1876ba74..449f816f79 100644
--- a/keyboards/atreus/keymaps/clash/keymap.c
+++ b/keyboards/atreus/keymaps/clash/keymap.c
@@ -34,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* auto voldn super shift bksp ctrl || alt space L0 prtsc scroll pause
*/
[_LW] = LAYOUT( /* [> LOWER <] */
- KC_INS, KC_HOME, KC_MS_U, KC_END, KC_PGUP, KC_BTN1, KC_F7, KC_F8, KC_F9, KC_F10 ,
- OUT_USB, KC_MS_L, KC_MS_D, KC_MS_R, KC_PGDN, KC_BTN2, KC_F4, KC_F5, KC_F6, KC_F11 ,
- OUT_BT, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_BTN3, KC_F1, KC_F2, KC_F3, KC_F12 ,
- OUT_AUTO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS )
+ KC_INS, KC_HOME, KC_MS_U, KC_END, KC_PGUP, KC_BTN1, KC_F7, KC_F8, KC_F9, KC_F10 ,
+ OU_USB, KC_MS_L, KC_MS_D, KC_MS_R, KC_PGDN, KC_BTN2, KC_F4, KC_F5, KC_F6, KC_F11 ,
+ OU_BT, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_BTN3, KC_F1, KC_F2, KC_F3, KC_F12 ,
+ OU_AUTO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
};
diff --git a/keyboards/atreus/keymaps/default/keymap.c b/keyboards/atreus/keymaps/default/keymap.c
index 02509b6279..a2fdc75ac7 100644
--- a/keyboards/atreus/keymaps/default/keymap.c
+++ b/keyboards/atreus/keymaps/default/keymap.c
@@ -40,5 +40,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 ,
KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 ,
KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 ,
- KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS )
+ KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
};
diff --git a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
index 50ff84388f..c6a628e217 100644
--- a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
@@ -101,8 +101,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT(
KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L,
KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S,
- KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,
- OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), MO(COMBINED), MO(KEYNAV), KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT)
+ KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,
+ OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), MO(COMBINED), MO(KEYNAV), KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_CAPS, OSM(MOD_LSFT)
),
#ifdef USE_VSCODE_MACROS
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[KEYNAV] = LAYOUT(
KC_ESC, VS_DEFINITION, RCTL(KC_Z), RCTL(KC_S), MEH(KC_A), MEH(KC_B), KC_HOME, KC_UP, KC_END, KC_PGUP,
VS_BACK, VS_SYMBOLEDITOR, RSFT(KC_TAB), KC_TAB, SHELL_DEL_WORD, LCTL(KC_LEFT), KC_LEFT, KC_DOWN, KC_RIGHT, LCTL(KC_RIGHT),
- VS_LINE, VS_FILE, VS_TABLEFT, VS_TABRIGHT, VS_CLOSETAB, KC_TRNS, RCTL(KC_C), RCTL(KC_X), RCTL(KC_V), KC_PGDOWN,
+ VS_LINE, VS_FILE, VS_TABLEFT, VS_TABRIGHT, VS_CLOSETAB, KC_TRNS, RCTL(KC_C), RCTL(KC_X), RCTL(KC_V), KC_PGDN,
VS_COMMANDS, VS_CMT_LINE, VS_BM_PREV, VS_BM_NEXT, VS_BM_TOGGLE, KC_TRNS, KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_DELETE, LCTL(KC_DELETE)
),
#else
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[KEYNAV] = LAYOUT(
KC_ESC, AS_GO_IMPLEMENTATION, RCTL(KC_Z), RCTL(KC_S), MEH(KC_A), MEH(KC_B), KC_HOME, KC_UP, KC_END, KC_PGUP,
AS_BACK, AS_SYMBOL, RSFT(KC_TAB), KC_TAB, SHELL_DEL_WORD, LCTL(KC_LEFT), KC_LEFT, KC_DOWN, KC_RIGHT, LCTL(KC_RIGHT),
- AS_FINDUSAGE, AS_CLASS, AS_TABLEFT, AS_TABRIGHT, AS_CLOSETAB, KC_TRNS, RCTL(KC_C), RCTL(KC_X), RCTL(KC_V), KC_PGDOWN,
+ AS_FINDUSAGE, AS_CLASS, AS_TABLEFT, AS_TABRIGHT, AS_CLOSETAB, KC_TRNS, RCTL(KC_C), RCTL(KC_X), RCTL(KC_V), KC_PGDN,
AS_CLOSETOOLWINDOW, AS_GO_DECLARATION, KC_TRNS, KC_TRNS, AS_ALTENTER, KC_TRNS, KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_DELETE, LCTL(KC_DELETE)
),
#endif
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[COMBINED] = LAYOUT(
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_PLUS, KC_7, KC_8, KC_9, KC_ASTR,
- KC_LPRN, KC_RPRN, KC_LBRACKET, KC_RBRACKET, KC_UNDS, KC_MINS, KC_4, KC_5, KC_6, KC_SLSH,
+ KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, KC_UNDS, KC_MINS, KC_4, KC_5, KC_6, KC_SLSH,
KC_COLN, KC_DQUO, KC_LCBR, KC_RCBR, KC_AMPR, KC_EQUAL, KC_1, KC_2, KC_3, KC_QUES,
KC_TRNS, KC_TILD, KC_GRAVE, KC_CIRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_DOT, KC_PIPE, KC_BSLS
),
diff --git a/keyboards/atreus/keymaps/erlandsona/keymap.c b/keyboards/atreus/keymaps/erlandsona/keymap.c
index 75491e6869..64d2408040 100644
--- a/keyboards/atreus/keymaps/erlandsona/keymap.c
+++ b/keyboards/atreus/keymaps/erlandsona/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[MOUS] = LAYOUT( /* Mouse and Media Keys */
- KC_SLCK, KC_PAUSE, KC_F11 , KC_F10 , KC_F9 , KC_F8 , KC_F7 , KC_F6 , KC_F5 , KC_F4,
+ KC_SCRL, KC_PAUSE, KC_F11 , KC_F10 , KC_F9 , KC_F8 , KC_F7 , KC_F6 , KC_F5 , KC_F4,
KC_VOLD, KC_ACL0 , KC_ACL1, KC_ACL2, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_F3,
KC_MUTE, KC_MPRV , KC_MPLY, KC_MNXT, KC_MUTE, KC_WH_R, KC_WH_U, KC_WH_D, KC_WH_L, KC_F2,
_______, _______ , _______, _______, _______, _______, _______, KC_BTN1, TO(BASE), QK_BOOT, KC_F12 , KC_F1
diff --git a/keyboards/atreus/keymaps/henxing/keymap.c b/keyboards/atreus/keymaps/henxing/keymap.c
index 8a792dbc42..21aaa24006 100644
--- a/keyboards/atreus/keymaps/henxing/keymap.c
+++ b/keyboards/atreus/keymaps/henxing/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10, \
KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11, \
KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F12, \
- KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, QWERTY, KC_PSCR, KC_SLCK, KC_PAUS \
+ KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, QWERTY, KC_PSCR, KC_SCRL, KC_PAUS \
),
};
diff --git a/keyboards/atreus/keymaps/nojjan/keymap.c b/keyboards/atreus/keymaps/nojjan/keymap.c
index f7b8f0e51d..189a5c8e05 100644
--- a/keyboards/atreus/keymaps/nojjan/keymap.c
+++ b/keyboards/atreus/keymaps/nojjan/keymap.c
@@ -38,5 +38,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 ,
KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 ,
KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 ,
- KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS )
+ KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
};
diff --git a/keyboards/atreus/keymaps/ptillemans/keymap.c b/keyboards/atreus/keymaps/ptillemans/keymap.c
index 9328d8ce53..0c9655f5b1 100644
--- a/keyboards/atreus/keymaps/ptillemans/keymap.c
+++ b/keyboards/atreus/keymaps/ptillemans/keymap.c
@@ -44,6 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 ,
KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 ,
KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_TILD, KC_F1, KC_F2, KC_F3, KC_F12 ,
- KC_NO, KC_VOLD, _______, _______, KC_MNXT, _______, _______, _______, TO(_QW), KC_PSCR, KC_SLCK, KC_MPLY
+ KC_NO, KC_VOLD, _______, _______, KC_MNXT, _______, _______, _______, TO(_QW), KC_PSCR, KC_SCRL, KC_MPLY
)
};
diff --git a/keyboards/atreus/keymaps/via/keymap.c b/keyboards/atreus/keymaps/via/keymap.c
index f4e274377b..355e08ac2f 100644
--- a/keyboards/atreus/keymaps/via/keymap.c
+++ b/keyboards/atreus/keymaps/via/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 ,
KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 ,
KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 ,
- KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS ),
+ KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS ),
[_EM] = LAYOUT( /* [> EMPTY <] */
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
diff --git a/keyboards/atreus/keymaps/workman/keymap.c b/keyboards/atreus/keymaps/workman/keymap.c
index 3ca07c325a..c0633f6362 100644
--- a/keyboards/atreus/keymaps/workman/keymap.c
+++ b/keyboards/atreus/keymaps/workman/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_LW] = LAYOUT( /* [> LOWER <] */
KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10,
- KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11,
+ KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EN_DASH, KC_TRNS, KC_TRNS, DIAERESIS, QK_BOOT )
};
@@ -64,11 +64,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch(keycode) {
case DIAERESIS:
// assuming KC_CAPS is your Multi Key
- SEND_STRING(SS_TAP(X_CAPSLOCK)"\"");
+ SEND_STRING(SS_TAP(X_CAPS_LOCK)"\"");
return false;
case EN_DASH:
// assuming KC_CAPS is your Multi Key
- SEND_STRING(SS_TAP(X_CAPSLOCK)"--.");
+ SEND_STRING(SS_TAP(X_CAPS_LOCK)"--.");
return false;
}
}
diff --git a/keyboards/atreus/keymaps/xk/config.h b/keyboards/atreus/keymaps/xk/config.h
deleted file mode 100644
index a8b9c88057..0000000000
--- a/keyboards/atreus/keymaps/xk/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TOGGLE 1
-#define TAPPING_TERM 300
-#define ONESHOT_TAP_TOGGLE 3
-#define ONESHOT_LAYER_TOGGLE 3
-#define ONESHOT_TIMEOUT 800
-
-#define MOUSEKEY_INTERVAL 50
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_TIME_TO_MAX 60
-#define MOUSEKEY_MAX_SPEED 7
-
-#define MOUSEKEY_WHEEL_DELAY 0
-#define MOUSEKEY_WHEEL_MAX_SPEED 8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-
-#define IGNORE_MOD_TAP_INTERRUPT
-#define PERMISSIVE_HOLD
-
-#endif
diff --git a/keyboards/atreus/keymaps/xk/keymap.c b/keyboards/atreus/keymaps/xk/keymap.c
deleted file mode 100644
index 8264618004..0000000000
--- a/keyboards/atreus/keymaps/xk/keymap.c
+++ /dev/null
@@ -1,311 +0,0 @@
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-
-#include QMK_KEYBOARD_H
-
-#define _COLEMAK 0
-#define _KAMELOC 1
-#define _IKAPILA 2
-#define _IKASHFT 3
-#define _FNCTION 5
-#define _NINEKEY 6
-#define _GAMEQWERTY 7
-#define _MLAYER 8
-#define _GRVTABL 9
-
-enum custom_keycodes {
- COLEMAK = SAFE_RANGE,
- KAMELOC,
- IKAPILA,
- IKASHFT,
- FNCTION,
- NINEKEY,
- GAMEQWERTY,
- MLAYER,
- GRVTABL,
-};
-
-//TD Declarations
-enum {
-VOM = 0,
-PRN,
-EGT,
-HRD,
-XRD,
-DSH,
-ESC,
-EQE,
-PGN,
-HND,
-COD,
-UND,
-MND,
-F11,
-F12,
-F13,
-F14,
-F15,
-F16,
-F17,
-F18,
-F19,
-F20,
-//unicode_inputctl
-LINUX,
-WIN,
-WINSH,
-OSX,
-};
-
-// action-TAP for key/mod behavior LT(layer, KC)
-#define XK_TAB LT(_KAMELOC, KC_TAB)
-#define XK_BSP LT(_KAMELOC, KC_BSPC)
-
-#define XK_SPC LT(_IKAPILA, KC_SPC)
-#define XK_ENT LT(_IKAPILA, KC_ENT)
-#define XK_PGDN LT(_IKASHFT, KC_PGDN)
-#define XK_APO LT(_IKASHFT, KC_QUOT)
-#define XK_PGUP LT(_IKASHFT, KC_PGUP)
-#define PIPBOY LT(_FNCTION, KC_BSLS)
-
-#define XK_DEL LT(_IKASHFT, KC_DEL)
-#define XK_ESC LT(_GRVTABL, KC_ESC)
-
-// mod-TAP for mod/key behavior MT(modkey, KC)
-#define ALT_IT MT(MOD_RALT, KC_SCLN)
-#define SFT_IT MT(MOD_RSFT, KC_DOT)
-#define CTL_IT MT(MOD_RCTL, KC_SLSH)
-#define SFT_ENT MT(MOD_RSFT, KC_ENT)
-
-//sticky modifiers
-#define KYCTL OSM(MOD_LCTL)
-#define KYSFT OSM(MOD_LSFT)
-#define KYALT OSM(MOD_LALT)
-#define CAKY OSM(MOD_LCTL | MOD_LALT)
-
-//shortcuts
-#define CADEL LALT(LCTL(KC_DEL))
-#define CAINS LALT(LCTL(KC_INS))
-#define TGNKRO MAGIC_TOGGLE_NKRO
-
-#define NAVCH LCTL(KC_HOME)
-#define NAVCPD LCTL(KC_PGDN)
-#define NAVCPU LCTL(KC_PGUP)
-#define NAVCE LCTL(KC_END)
-#define NAVCU LCTL(KC_UP)
-#define NAVCD LCTL(KC_DOWN)
-#define NAVCL LCTL(KC_LEFT)
-#define NAVCR LCTL(KC_RGHT)
-#define NAVGU LGUI(KC_UP)
-#define NAVGD LGUI(KC_DOWN)
-#define NAVGL LGUI(KC_LEFT)
-#define NAVGR LGUI(KC_RGHT)
-
-#define KC_NDSH LCTL(KC_PMNS)
-#define KC_MDSH LALT(LCTL(KC_PMNS))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- /*
- TAP
- ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
- │ Q │ W │ F │ P │ B │ │ J │ L │ U │ Y │ ; │
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │ A │ R │ S │ T │ G │ │ M │ N │ E │ I │ O │
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │ X │ C │ D │ V │ Z ├────┐ ┌────┤ K │ H │ , │ . │ / │
- ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
- │SFTn│CTLn│ALTn│ROUS│SPC │BKSP│ │TAB │ENT │PGDN│ ' │ \ │ESC │
- └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
- HOLD
- ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
- │ │ │ │ │ │ │ │ │ │ │ALT │
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │ │ │ │ │ │ │ │ │ │ │ │
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │ │ │ │ │ ├────┐ ┌────┤ │ │ │ │CTL │
- ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
- │SFT │CTL │ALT │ROUS│L123│L OH│ │L OH│L123│L!@#│ │L FN│LESC│
- └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
- DOUBLETAP
- ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
- │ │ │ │ │ │ │ │ │ │ │ │
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │ │ │ │ │ │ │ │ │ │ │ │
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │ │ │ │ │ ├────┐ ┌────┤ │ │ │ │ │
- ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
- │OSML│OSML│OSML│NADA│ │ │ │ │ │ │ │ │ │
- └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
- */
-
- // Colemak PB&J (Mod-DH)
- [_COLEMAK] = LAYOUT( \
- KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, ALT_IT, \
- KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, \
- KC_X, KC_C, KC_D, KC_V, KC_Z, KC_K, KC_H, KC_COMM, SFT_IT, CTL_IT, \
- KYCTL, KYSFT, KYALT, TT(_MLAYER), XK_SPC, XK_TAB, XK_BSP, XK_ENT, XK_PGDN, XK_APO, PIPBOY, XK_ESC \
- ),
-
- // useful for one-handed typing
- [_KAMELOC] = LAYOUT( \
- KC_SCLN, KC_Y, KC_U, KC_L, KC_J, KC_B, KC_P, KC_F, KC_W, KC_Q, \
- KC_O, KC_I, KC_E, KC_N, KC_M, KC_G, KC_T, KC_S, KC_R, KC_A, \
- KC_SLSH, KC_DOT, KC_COMM, KC_H, KC_K, KC_Z, KC_V, KC_D, KC_C, KC_X, \
- XK_ESC, PIPBOY, TT(_MLAYER), KC_PGDN, KC_ENT, _______, _______, XK_SPC, KC_PGUP, KYALT, KYCTL, KYSFT \
- ),
-
- /*
- ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
- │ 1 │ 2 │ 3 │ 4 │ 5 │ │ 6 │ 7 │ 8 │ 9 │ 0 │
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │ M │ V- │ V+ │NEXT│PLAY│ │ ← │ ↓ │ ↑ │ → │DASH│
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │ - │ = │ ` │GUI │UNDO├────┐ ┌────┤HOME│END │HOME│INS │ \ │
- ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
- │ │ │ │ │ │ │ │ │ │GUI │ │ │ │
- └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
- */
-
- [_IKAPILA] = LAYOUT( \
- KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \
- KC_MUTE, KC_VOLD, KC_VOLU, TD(MND), KC_MPLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TD(DSH), \
- KC_MINS, KC_EQL, KC_GRV, KC_LGUI, LCTL(KC_Z), TD(HND), KC_HOME, TD(HND), KC_INS, KC_BSLS, \
- _______, _______, _______, _______, _______, _______, _______, _______, KC_LGUI, _______, _______, KYSFT \
- ),
-
- /*
- ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
- │ ! │ @ │ # │ $ │ % │ │ ^ │ & │ * │ ( │ ) │
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │PSCR│ ← │ ↓ │ ↑ │ → │ │NEXT│PGUP│ V+ │ V- │DASH│
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │ _ │ + │ ~ │HOME│END ├────┐ ┌────┤ {} │ () │ <> │ [ │ ] │
- ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
- │ │ │ │ │ │DEL │ │BKSP│ │ │ │ │ │
- └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
- */
-
- [_IKASHFT] = LAYOUT( \
- KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, \
- KC_PSCR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TD(MND), KC_PGUP, KC_VOLU, TD(VOM), KC_MDSH, \
- KC_UNDS, KC_PLUS, KC_TILD, KC_HOME, KC_END, M(1), M(0), M(5), KC_LBRC, KC_RBRC, \
- _______, _______, _______, _______, _______, KC_BSPC, KC_DEL, _______, _______, _______, _______, _______ \
- ),
-
- /*
- ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
- │ F1 │ F2 │ F3 │ F4 │ F5 │ │ F6 │ F7 │ F8 │ F9 │ F10│
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │ F21│ F22│ F23│ F24│PAUS│ │ │SCLK│BOOT│ │NKRO│
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │ │ │ │ │ ├────┐ ┌────┤ │ │ │ │CAPS│
- ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
- │ │ │ │ │ │ │ │ │ │ │ │ │ │
- └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
- */
-
- [_FNCTION] = LAYOUT( \
- TD(F11), TD(F12), TD(F13), TD(F14), TD(F15), TD(F16), TD(F17), TD(F18), TD(F19), TD(F20), \
- KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX, XXXXXXX, KC_SLCK, XXXXXXX, XXXXXXX, TGNKRO, \
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
- ),
-
- [_GAMEQWERTY] = LAYOUT( \
- KC_P, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, \
- KC_SCLN, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, \
- KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, TD(COD), \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
- ),
-
- /*
- ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
- │^HOM│^PGD│^UP │^PGU│^PGU│ │ │MW_L│ MU │MW_R│ AC2│
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │^END│^LFT│^DWN│^RGT│^PGD│ │ │ ML │ MD │ MR │ AC1│
- ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
- │ M5 │ M2 │ M4 │ M3 │ M1 ├────┐ ┌────┤ │MW_D│MW_U│ │ AC0│
- ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
- │ │ │ │ │ │ │ │ │ │ │ │ │ │
- └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
- */
-
- [_MLAYER] = LAYOUT( \
- LALT(KC_ESC), KC_9, KC_8, KC_7, KC_6, M(1), M(0), KC_MS_U, M(0), M(2), \
- KC_0, KC_2, KC_3, KC_4, KC_5, M(5), KC_MS_L, KC_MS_D, KC_MS_R, KC_ACL2, \
- KC_1, KC_0, XXXXXXX, XXXXXXX, KC_BTN5, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, M(5), \
- _______, _______, _______, _______, KC_BTN1, KC_BTN2, KC_BTN2, KC_BTN1, KC_BTN2, _______, KC_ACL0, _______ \
- ),
-
- //one_ring=2__rule__them-all
- [_GRVTABL] = LAYOUT( \
- LALT(KC_PSCR), M(4), KC_PWR, KC_POWER, QK_BOOT, QK_BOOT, KC_R, KC_E, KC_I, LALT(KC_PSCR), \
- TG(_NINEKEY), TG(_FNCTION), TG(_MLAYER), TG(_IKASHFT), TG(_IKAPILA), TG(_IKAPILA), KC_S, KC_U, KC_B, TG(_NINEKEY), \
- M(3), TG(_GAMEQWERTY), XXXXXXX, XXXXXXX, XXXXXXX, KC_MYCM, KC_CALC, XXXXXXX, TG(_GAMEQWERTY), M(3), \
- TT(_GRVTABL), TG(_FNCTION), TG(_MLAYER), TG(_IKASHFT), TG(_IKAPILA), _______, _______, TG(_IKAPILA), TG(_IKASHFT), TG(_MLAYER), TG(_MLAYER), TG(_NINEKEY) \
- ),
-};
-
-qk_tap_dance_action_t tap_dance_actions[] = {
- [VOM] = ACTION_TAP_DANCE_DOUBLE(KC_VOLD, KC_MUTE),
- [PRN] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN),
- [EGT] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR),
- [HRD] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
- [DSH] = ACTION_TAP_DANCE_DOUBLE(KC_NDSH, KC_MDSH),
- [ESC] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, LALT(KC_F4)),
- [EQE] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_ENT),
- [UND] = ACTION_TAP_DANCE_DOUBLE(KC_Z, LCTL(KC_Z)),
- [PGN] = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, KC_PGUP),
- [HND] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END),
- [COD] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_DOT),
- [MND] = ACTION_TAP_DANCE_DOUBLE(KC_MNXT, KC_MPRV),
- [F11] = ACTION_TAP_DANCE_DOUBLE(KC_F1, KC_F11),
- [F12] = ACTION_TAP_DANCE_DOUBLE(KC_F2, KC_F12),
- [F13] = ACTION_TAP_DANCE_DOUBLE(KC_F3, KC_F13),
- [F14] = ACTION_TAP_DANCE_DOUBLE(KC_F4, KC_F14),
- [F15] = ACTION_TAP_DANCE_DOUBLE(KC_F5, KC_F15),
- [F16] = ACTION_TAP_DANCE_DOUBLE(KC_F6, KC_F16),
- [F17] = ACTION_TAP_DANCE_DOUBLE(KC_F7, KC_F17),
- [F18] = ACTION_TAP_DANCE_DOUBLE(KC_F8, KC_F18),
- [F19] = ACTION_TAP_DANCE_DOUBLE(KC_F9, KC_F19),
- [F20] = ACTION_TAP_DANCE_DOUBLE(KC_F10, KC_F20),
-};
-
-void matrix_init_user(){
- set_unicode_input_mode(UC_LNX);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
- if (record->event.pressed) {
- switch(id) {
- case 0:
- return MACRO( D(LSFT), T(9), U(LSFT), D(LSFT), T(0), U(LSFT), T(LEFT), END );
- case 1:
- return MACRO( D(LSFT), T(LBRC), U(LSFT), D(LSFT), T(RBRC), U(LSFT), T(LEFT), END );
- case 2:
- return MACRO( T(LBRC), T(RBRC), T(LEFT), END);
- case 5:
- return MACRO( D(LSFT), T(COMMA), U(LSFT), D(LSFT), T(DOT), U(LSFT), END );
- case 3:
- clear_keyboard();
- return false;
- break;
- case 4:
- return MACRO( D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(9), U(LSFT), D(LSFT), T(0), U(LSFT), D(LSFT), T(LBRACKET), U(LSFT), D(LSFT), T(9), U(LSFT), D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(0), U(LSFT), D(LSFT), T(BSLASH), U(LSFT), D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(7), U(LSFT), D(LSFT), T(RBRACKET), U(LSFT), T(SCOLON), D(LSFT), T(SCOLON), U(LSFT), END );
- case WINSH:
- set_unicode_input_mode(UC_WIN);
- return false;
- break;
- case WIN:
- set_unicode_input_mode(UC_WINC);
- return false;
- break;
- case OSX:
- set_unicode_input_mode(UC_OSX);
- return false;
- break;
- }
- }
- return MACRO_NONE;
-};
diff --git a/keyboards/atreus/keymaps/xk/rules.mk b/keyboards/atreus/keymaps/xk/rules.mk
deleted file mode 100644
index a2c5143eff..0000000000
--- a/keyboards/atreus/keymaps/xk/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
-NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-TAP_DANCE_ENABLE = yes
-
-CONSOLE_ENABLE = no # Console for debug(+400)
-COMMAND_ENABLE = no # Commands for debug and configuration
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-MIDI_ENABLE = no # MIDI controls
-AUDIO_ENABLE = no # Audio output on port C6
-UNICODE_ENABLE = yes # Unicode
-BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-
diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c
index 98dface93c..b6cc5a6890 100644
--- a/keyboards/atreus/keymaps/xyverz/keymap.c
+++ b/keyboards/atreus/keymaps/xyverz/keymap.c
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
`----------------------------------' `----------------------------------'*/
[_ADJUST] = LAYOUT(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 ,
- KC_F11, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12 ,
+ KC_F11, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12 ,
_______, QWERTY, COLEMAK, DVORAK, DVORMAC, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
),
diff --git a/keyboards/atreus/keymaps/yttyx/keymap.c b/keyboards/atreus/keymaps/yttyx/keymap.c
index ad34182212..ce19fc7da5 100644
--- a/keyboards/atreus/keymaps/yttyx/keymap.c
+++ b/keyboards/atreus/keymaps/yttyx/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][ MATRIX_ROWS ][ MATRIX_COLS ] = {
'-------'-------'-----' '-----'------'-------'
*/
[P3] = LAYOUT(
- KC_ESC, XXXXXXX, KC_BRK, KC_PSCR, KC_SLCK, KC_LABK, KC_RABK, KC_PLUS, KC_UNDS, KC_EQL,
+ KC_ESC, XXXXXXX, KC_BRK, KC_PSCR, KC_SCRL, KC_LABK, KC_RABK, KC_PLUS, KC_UNDS, KC_EQL,
KC_TAB, XXXXXXX, XXXXXXX, KC_CAPS, XXXXXXX, KC_LBRC, KC_RBRC, KC_ASTR, KC_MINS, KC_ENT,
KC_LSFT, KC_LCTL, KC_LALT, KC_DEL, XXXXXXX, KX_AT, KC_LALT, KC_LCTL, KC_LSFT, _______,
XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC, XXXXXXX, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX