mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Merge pull request #943 from lucwastiaux/master
Update dvorak_programmer layout
This commit is contained in:
		
						commit
						a30591cd53
					
				@ -5,4 +5,4 @@ FORCE_NKRO ?= yes
 | 
				
			|||||||
DEBUG_ENABLE = no
 | 
					DEBUG_ENABLE = no
 | 
				
			||||||
CONSOLE_ENABLE = no
 | 
					CONSOLE_ENABLE = no
 | 
				
			||||||
TAP_DANCE_ENABLE = yes
 | 
					TAP_DANCE_ENABLE = yes
 | 
				
			||||||
MOUSEKEY_ENABLE = no
 | 
					MOUSEKEY_ENABLE = yes
 | 
				
			||||||
 | 
				
			|||||||
@ -11,5 +11,19 @@ Layers
 | 
				
			|||||||
* KEY_NAV: arrow key movement with backward/forward word support, and copy/paste.
 | 
					* KEY_NAV: arrow key movement with backward/forward word support, and copy/paste.
 | 
				
			||||||
* KEY_SEL: same as above, but every movement shift-selects.
 | 
					* KEY_SEL: same as above, but every movement shift-selects.
 | 
				
			||||||
* NUMBER: keypad layer.
 | 
					* NUMBER: keypad layer.
 | 
				
			||||||
* SYMBOL: all the symbols as well as brackets at the bottom.
 | 
					* SYMBOL: all the symbols.
 | 
				
			||||||
 | 
					* BRACKET: special brackets-only layer for programming
 | 
				
			||||||
* SHORTCUTS: sends Hyper keys for Autohotkey to interpret. I use this to switch between specific apps.
 | 
					* SHORTCUTS: sends Hyper keys for Autohotkey to interpret. I use this to switch between specific apps.
 | 
				
			||||||
 | 
					* MOUSE: use mouse keys
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Updates
 | 
				
			||||||
 | 
					-------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					2016/12/10:
 | 
				
			||||||
 | 
					* toggle for brackets layer is now on left thumb cluster.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					2016/11/05:
 | 
				
			||||||
 | 
					* removed brackets anywhere but in brackets layer
 | 
				
			||||||
 | 
					* added mouse layer back in
 | 
				
			||||||
 | 
					* put semicolon-newline and end-newline on symbol layer
 | 
				
			||||||
 | 
					* replaced all HYPR with MEH, added more shortcut keys
 | 
				
			||||||
@ -13,6 +13,7 @@
 | 
				
			|||||||
#define SYMBOL  6
 | 
					#define SYMBOL  6
 | 
				
			||||||
#define BRACKETS  7
 | 
					#define BRACKETS  7
 | 
				
			||||||
#define SHORTCUTS 8
 | 
					#define SHORTCUTS 8
 | 
				
			||||||
 | 
					#define MOUSE 9
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// macros
 | 
					// macros
 | 
				
			||||||
#define MC_COPY_LINE  0
 | 
					#define MC_COPY_LINE  0
 | 
				
			||||||
@ -57,12 +58,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
[BASE] = KEYMAP(  // layer 0 : default
 | 
					[BASE] = KEYMAP(  // layer 0 : default
 | 
				
			||||||
        // left hand
 | 
					        // left hand
 | 
				
			||||||
        KC_ESC,                    KC_F1,          KC_F2,       KC_F3,        KC_F4,       KC_F5,       KC_F6,
 | 
					        KC_ESC,                    KC_F1,          KC_F2,       KC_F3,        KC_F4,       KC_F5,       KC_F6,
 | 
				
			||||||
        LT(BRACKETS,KC_TAB),                    KC_QUOT,        KC_COMM,     KC_DOT,       KC_P,        KC_Y,        MO(KEY_SEL),
 | 
					        LT(MOUSE,KC_TAB),       KC_QUOT,        KC_COMM,     KC_DOT,       KC_P,        KC_Y,        MO(KEY_SEL),
 | 
				
			||||||
        MO(SHELL_NAV),             KC_A,           KC_O,        KC_E,         KC_U,        KC_I,
 | 
					        MO(SHELL_NAV),             KC_A,           KC_O,        KC_E,         KC_U,        KC_I,
 | 
				
			||||||
        KC_FN3,                    KC_SCLN,        KC_Q,        KC_J,         KC_K,        KC_X,        MO(KEY_NAV),
 | 
					        KC_FN3,                    KC_SCLN,        KC_Q,        KC_J,         KC_K,        KC_X,        MO(KEY_NAV),
 | 
				
			||||||
                   OSL(SHORTCUTS),KC_FN4, KC_FN5,OSL(SYMBOL),MO(NUMBER),  
 | 
					                   OSL(SHORTCUTS),KC_FN4, KC_FN5,OSL(SYMBOL),MO(NUMBER),  
 | 
				
			||||||
                                              // thumb cluster
 | 
					                                              // thumb cluster
 | 
				
			||||||
                                                       RCTL(KC_F), RCTL(KC_S),
 | 
					                                               MO(BRACKETS), RCTL(KC_S),
 | 
				
			||||||
                                                                      RCTL(KC_DEL),
 | 
					                                                                      RCTL(KC_DEL),
 | 
				
			||||||
                                               KC_BSPC,RCTL(KC_BSPC),KC_DEL,
 | 
					                                               KC_BSPC,RCTL(KC_BSPC),KC_DEL,
 | 
				
			||||||
        // right hand
 | 
					        // right hand
 | 
				
			||||||
@ -71,9 +72,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
                          KC_D,        KC_H,        KC_T,          KC_N,         KC_S,         KC_MINS,
 | 
					                          KC_D,        KC_H,        KC_T,          KC_N,         KC_S,         KC_MINS,
 | 
				
			||||||
             KC_PGDN,     KC_B,        KC_M,        KC_W,          KC_V,         KC_Z,         TD(TD_SHIFT_CAPSLOCK),
 | 
					             KC_PGDN,     KC_B,        KC_M,        KC_W,          KC_V,         KC_Z,         TD(TD_SHIFT_CAPSLOCK),
 | 
				
			||||||
                                  // lower keys - browser tab control
 | 
					                                  // lower keys - browser tab control
 | 
				
			||||||
                                  RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), RCTL(KC_T), RCTL(KC_K), RCTL(KC_W),
 | 
					                                  RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), RCTL(KC_T), LALT(KC_LEFT), RCTL(KC_W),
 | 
				
			||||||
             // thumb cluster
 | 
					             // thumb cluster
 | 
				
			||||||
             M(SEMICOLON_NEWLINE), M(END_NEWLINE),
 | 
					             KC_HOME,KC_END,
 | 
				
			||||||
             KC_UP,
 | 
					             KC_UP,
 | 
				
			||||||
             KC_DOWN,KC_ENT, KC_SPC
 | 
					             KC_DOWN,KC_ENT, KC_SPC
 | 
				
			||||||
    ),
 | 
					    ),
 | 
				
			||||||
@ -96,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
       KC_TRNS,    KC_TRNS,        KC_TRNS,             KC_TRNS,         KC_TRNS,         KC_TRNS,        KC_TRNS,
 | 
					       KC_TRNS,    KC_TRNS,        KC_TRNS,             KC_TRNS,         KC_TRNS,         KC_TRNS,        KC_TRNS,
 | 
				
			||||||
       RCTL(KC_L), RCTL(KC_W),     KC_HOME,             KC_UP,           KC_END,          LALT(KC_D),     RCTL(KC_R),
 | 
					       RCTL(KC_L), RCTL(KC_W),     KC_HOME,             KC_UP,           KC_END,          LALT(KC_D),     RCTL(KC_R),
 | 
				
			||||||
                   LALT(KC_B),     KC_LEFT,             KC_DOWN,         KC_RIGHT,        LALT(KC_F),     LALT(KC_DOT),
 | 
					                   LALT(KC_B),     KC_LEFT,             KC_DOWN,         KC_RIGHT,        LALT(KC_F),     LALT(KC_DOT),
 | 
				
			||||||
       RCTL(KC_C), RCTL(KC_U),     M(SCREEN_COPY_MODE), M(SCREEN_PASTE), HYPR(KC_V),      RCTL(KC_K),     M(SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND),
 | 
					       RCTL(KC_C), RCTL(KC_U),     M(SCREEN_COPY_MODE), M(SCREEN_PASTE), MEH(KC_V),      RCTL(KC_K),     M(SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND),
 | 
				
			||||||
                // bottom row
 | 
					                // bottom row
 | 
				
			||||||
                 M(SCREEN_TAB_LEFT), M(SCREEN_TAB_RIGHT), M(SCREEN_NEW_TAB),  KC_TRNS,    KC_TRNS,
 | 
					                 M(SCREEN_TAB_LEFT), M(SCREEN_TAB_RIGHT), M(SCREEN_NEW_TAB),  KC_TRNS,    KC_TRNS,
 | 
				
			||||||
       // thumb cluster
 | 
					       // thumb cluster
 | 
				
			||||||
@ -187,21 +188,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
[SYMBOL] = KEYMAP(
 | 
					[SYMBOL] = KEYMAP(
 | 
				
			||||||
       // left hand
 | 
					       // left hand
 | 
				
			||||||
       KC_NO,KC_F1,  KC_F2,                 KC_F3,   KC_F4,   KC_F5,                     KC_F6,
 | 
					       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
 | 
				
			||||||
       KC_TRNS,KC_TRNS,             M(OPEN_CLOSE_PAREN),   KC_LPRN, KC_RPRN, KC_TRNS,                   KC_TRNS,
 | 
					       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
 | 
				
			||||||
       KC_TRNS,KC_TRNS,             M(OPEN_CLOSE_BRACKET), KC_LBRC, KC_RBRC, M(OPEN_CLOSE_DOUBLE_QUOTE),
 | 
					       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
 | 
				
			||||||
       KC_TRNS,M(SEMICOLON_NEWLINE),M(OPEN_CLOSE_CURLY),   KC_LCBR, KC_RCBR, M(OPEN_CLOSE_SINGLE_QUOTE),KC_TRNS,       
 | 
					       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,       
 | 
				
			||||||
       KC_TRNS,                     KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
 | 
					       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
 | 
				
			||||||
                                       KC_TRNS,KC_TRNS,
 | 
					                                       KC_TRNS,KC_TRNS,
 | 
				
			||||||
                                               KC_TRNS,
 | 
					                                               KC_TRNS,
 | 
				
			||||||
                               KC_TRNS,KC_TRNS,KC_TRNS,
 | 
					                               KC_TRNS,KC_TRNS,KC_TRNS,
 | 
				
			||||||
       // right hand
 | 
					       // right hand
 | 
				
			||||||
       KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_TRNS,
 | 
					       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
				
			||||||
       KC_TRNS, KC_PLUS, KC_AMPR, KC_ASTR, KC_GRAVE,KC_TILD, KC_TRNS,
 | 
					       KC_TRNS, KC_PLUS, KC_AMPR, KC_ASTR, KC_GRAVE,KC_TILD, KC_TRNS,
 | 
				
			||||||
                KC_MINS, KC_DLR,  KC_PERC, KC_CIRC, KC_PIPE, KC_TRNS,
 | 
					                KC_MINS, KC_DLR,  KC_PERC, KC_CIRC, KC_PIPE, KC_TRNS,
 | 
				
			||||||
       KC_TRNS, KC_EQUAL,KC_EXLM, KC_AT,   KC_HASH, KC_TRNS, KC_TRNS,
 | 
					       KC_TRNS, KC_EQUAL,KC_EXLM, KC_AT,   KC_HASH, KC_TRNS, KC_TRNS,
 | 
				
			||||||
                         KC_LBRC, KC_RBRC, TD(TD_BRK_LEFT), TD(TD_BRK_RIGHT), KC_TRNS,
 | 
					                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 | 
				
			||||||
       KC_TRNS, KC_TRNS,
 | 
					       M(SEMICOLON_NEWLINE), M(END_NEWLINE),
 | 
				
			||||||
       KC_TRNS,
 | 
					       KC_TRNS,
 | 
				
			||||||
       KC_TRNS, KC_TRNS, KC_TRNS
 | 
					       KC_TRNS, KC_TRNS, KC_TRNS
 | 
				
			||||||
),
 | 
					),
 | 
				
			||||||
@ -229,26 +230,46 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
[SHORTCUTS] = KEYMAP(
 | 
					[SHORTCUTS] = KEYMAP(
 | 
				
			||||||
       // left hand
 | 
					       // left hand
 | 
				
			||||||
       KC_NO,  HYPR(KC_F1),    HYPR(KC_F2), HYPR(KC_F3),  HYPR(KC_F4), HYPR(KC_F5), HYPR(KC_F6),
 | 
					       KC_NO,  MEH(KC_F1), MEH(KC_F2), MEH(KC_F3),  MEH(KC_F4), MEH(KC_F5), MEH(KC_F6),
 | 
				
			||||||
       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
 | 
					       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
 | 
				
			||||||
       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
 | 
					       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
 | 
				
			||||||
       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,       
 | 
					       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,       
 | 
				
			||||||
       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
 | 
					       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
 | 
				
			||||||
                                       KC_TRNS,KC_TRNS,
 | 
					                                         MEH(KC_0),MEH(KC_1),
 | 
				
			||||||
                                               KC_TRNS,
 | 
					                                                   MEH(KC_2),
 | 
				
			||||||
                               KC_TRNS,KC_TRNS,KC_TRNS,
 | 
					                               MEH(KC_3),MEH(KC_4),MEH(KC_5),
 | 
				
			||||||
       // right hand
 | 
					       // right hand
 | 
				
			||||||
       HYPR(KC_F7), HYPR(KC_F8), HYPR(KC_F9), HYPR(KC_F10),  HYPR(KC_F11), HYPR(KC_F12),  M(SWITCH_NDS),
 | 
					       MEH(KC_F7), MEH(KC_F8), MEH(KC_F9), MEH(KC_F10),  MEH(KC_F11), MEH(KC_F12),  M(SWITCH_NDS),
 | 
				
			||||||
       KC_TRNS, HYPR(KC_A), HYPR(KC_B),    HYPR(KC_C),    HYPR(KC_D),    HYPR(KC_E), HYPR(KC_F),
 | 
					       KC_TRNS, MEH(KC_A), MEH(KC_B),    MEH(KC_C),    MEH(KC_D),    MEH(KC_E), MEH(KC_F),
 | 
				
			||||||
                HYPR(KC_G), HYPR(KC_H),    HYPR(KC_I),    HYPR(KC_J),    HYPR(KC_K), HYPR(KC_L),
 | 
					                MEH(KC_G), MEH(KC_H),    MEH(KC_I),    MEH(KC_J),    MEH(KC_K), MEH(KC_L),
 | 
				
			||||||
       KC_TRNS, HYPR(KC_M), HYPR(KC_N),    HYPR(KC_O),    HYPR(KC_P),    HYPR(KC_Q), HYPR(KC_R),
 | 
					       KC_TRNS, MEH(KC_M), MEH(KC_N),    MEH(KC_O),    MEH(KC_P),    MEH(KC_Q), MEH(KC_R),
 | 
				
			||||||
                             LALT(KC_LEFT),LALT(KC_RIGHT),KC_F5, LCTL(LGUI(KC_LEFT)), LCTL(LGUI(KC_RIGHT)),
 | 
					                           MEH(KC_S),    MEH(KC_T),    MEH(KC_U),    MEH(KC_V), MEH(KC_X),
 | 
				
			||||||
       KC_TRNS, KC_TRNS,
 | 
					       MEH(KC_6), MEH(KC_7),
 | 
				
			||||||
       KC_TRNS,
 | 
					       MEH(KC_8),
 | 
				
			||||||
       KC_TRNS, KC_TRNS, KC_TRNS
 | 
					       MEH(KC_9), MEH(KC_Y), MEH(KC_Z)
 | 
				
			||||||
),
 | 
					),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[MOUSE] = KEYMAP(
 | 
				
			||||||
 | 
					       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
				
			||||||
 | 
					       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
				
			||||||
 | 
					       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
				
			||||||
 | 
					       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
				
			||||||
 | 
					       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
				
			||||||
 | 
					                                           KC_TRNS, KC_TRNS,
 | 
				
			||||||
 | 
					                                                    KC_TRNS,
 | 
				
			||||||
 | 
					                                  KC_TRNS, KC_TRNS, KC_TRNS,
 | 
				
			||||||
 | 
					    // right hand
 | 
				
			||||||
 | 
					       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
				
			||||||
 | 
					       KC_TRNS,  KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
				
			||||||
 | 
					                 KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS,
 | 
				
			||||||
 | 
					       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
				
			||||||
 | 
					                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
				
			||||||
 | 
					       KC_TRNS, KC_TRNS,
 | 
				
			||||||
 | 
					       KC_TRNS,
 | 
				
			||||||
 | 
						   KC_TRNS, KC_BTN1, KC_BTN2
 | 
				
			||||||
 | 
					),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user