Updated keymap and file permissions.

keymap.c

@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 #include "oneshot.h"
 
-#define LOCK LGUI(KC_ESC)
-#define CTLBSPC LCTL(KC_BSPC)
-#define CTLDEL LCTL(KC_DEL)
-
 enum tap_dance{
 	GUI_ALT
 };
@@ -31,12 +27,12 @@ qk_tap_dance_action_t tap_dance_actions[] =  {
 	[GUI_ALT] = ACTION_TAP_DANCE_DOUBLE(KC_LGUI, KC_LALT)
 };
 
-enum eycodes {
+enum keycodes {
 	DL_COLE = SAFE_RANGE,
 	DL_QWER,
 	DL_GAME,
 	OS_GUI,
-	OS_CTL,
+	OS_CTRL,
 	OS_ALT,
 	OS_SHFT,
 };
@@ -48,9 +44,7 @@ enum layers {
 	G1,
 	L1,
 	L2,
-	R1,
+	L3,
-	R2,
-	FN,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -58,11 +52,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
        KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                         KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       KC_ESC,    KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                         KC_H,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT,
+       KC_ESC,   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                         KC_H,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_K,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          MO(L2),  KC_ENT,  MO(L1),     MO(R1),  KC_SPC,   MO(R2)
+                                   KC_LGUI, LCTL_T(KC_ENT),  MO(L1),     MO(L2),  KC_SPC, KC_RGUI
                                       //`--------------------------'  `--------------------------'
   ),
 
@@ -74,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          MO(L2),  KC_ENT,  MO(L1),     MO(R1),  KC_SPC,   MO(R2)
+                                  KC_LGUI,  LCTL_T(KC_ENT),  MO(L1),     MO(L2),  KC_SPC, KC_RGUI
                                       //`--------------------------'  `--------------------------'
   ),
 
@@ -102,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______,    KC_5,                      _______, _______, _______, _______, _______, _______,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,     MO(FN), _______, _______
+                                          _______, _______, _______,     MO(L3), _______, _______
                                       //`--------------------------'  `--------------------------'
   ),
 
@@ -112,66 +106,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [L1] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR,  KC_GRV, KC_TILD,  KC_DEL,
+       KC_ESC, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR,  KC_GRV, KC_TILD, _______,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_UNDS, KC_LBRC, KC_LCBR, KC_LPRN,KC_MINUS,                      KC_PLUS, KC_RPRN, KC_RCBR, KC_RBRC,  KC_EQL, _______, 
+      _______, KC_UNDS, KC_LBRC, KC_LCBR, KC_LPRN,KC_MINUS,                      KC_PLUS, KC_RPRN, KC_RCBR, KC_RBRC,  KC_EQL,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, KC_PIPE, KC_BSLS, _______, 
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          XXXXXXX, XXXXXXX, XXXXXXX,     MO(FN), OS_CTL,   OS_ALT
+                                          _______, _______, _______,     MO(L3), OS_CTRL,  OS_ALT
                                       //`--------------------------'  `--------------------------'
   ),
-
+  
   /*
-   * Navigation / Numbers layer.
+   * Navigation layer.
-   */
-  [R1] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_CAPS, KC_HOME, KC_PGUP, KC_PGDN,  KC_END,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, XXXXXXX, _______, 
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, 
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                           OS_ALT,  OS_CTL,  MO(FN),    XXXXXXX, XXXXXXX, XXXXXXX
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  /*
-   * One Shot Modifier layers.
    */
 
   [L2] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX,  CTLDEL, CTLBSPC,  KC_DEL,
+      _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-         LOCK,  OS_ALT,  OS_CTL,  OS_GUI, OS_SHFT, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX,  KC_DEL, KC_BSPC, _______,
+      _______, KC_CAPS, KC_HOME, KC_PGUP, KC_PGDN,  KC_END,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, XXXXXXX,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, 
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_INS,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,     MO(R1),  OS_CTL,  OS_ALT
+                                           OS_ALT, OS_CTRL,  MO(L3),    _______, _______, _______
-                                      //`--------------------------'  `--------------------------'
-  ),
-  
-  [R2] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_DEL,
-  //|--------+--------+--------+--------+--------+--------+                    |---------+--------+--------+--------+--------+-------|
-         LOCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, OS_SHFT,  OS_GUI, OS_CTL,  OS_ALT,  KC_ENT,
-  //|--------+--------+--------+--------+--------+--------+                    |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                           OS_ALT,  OS_CTL,  MO(L1),    _______, _______, _______
                                       //`--------------------------'  `--------------------------'
   ),
 
-  [FN] = LAYOUT_split_3x6_3(
+  [L3] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                        KC_F6,   KC_F7,   KC_F8,  KC_F9,   KC_F10, _______,
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                        KC_F6,   KC_F7,   KC_F8,  KC_F9,   KC_F10, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, DL_COLE, DL_QWER, DL_GAME, XXXXXXX,  KC_F11,                       KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, _______,
+      XXXXXXX, DL_COLE, DL_QWER, DL_GAME, XXXXXXX,  KC_F11,                       KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, OS_CTL,   OS_ALT, OS_SHFT, XXXXXXX,                      XXXXXXX,OS_SHFT,  OS_ALT, OS_CTL,  XXXXXXX, _______,
+      XXXXXXX, XXXXXXX, OS_CTRL,  OS_ALT, OS_SHFT, XXXXXXX,                      XXXXXXX, OS_SHFT,  OS_ALT, OS_CTRL, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                           _______, _______, _______,    _______, _______, _______
                                       //`--------------------------'  `--------------------------'
@@ -181,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Callum's one shot functionality
 bool is_oneshot_cancel_key(uint16_t keycode) {
 	switch (keycode) {
-		case KC_ESC: 
+		case KC_ESC : 
 			return true;
 		default:
 			return false;
@@ -192,12 +159,10 @@ bool is_oneshot_ignored_key(uint16_t keycode) {
 	switch (keycode) {
 		case MO(L1):
 		case MO(L2):
-		case MO(R1):
-		case MO(R2):
 		case KC_LSFT:
 		case KC_RSFT:
 		case OS_SHFT:
-		case OS_CTL:
+		case OS_CTRL:
 		case OS_ALT:
 		case OS_GUI:
 			return true;
@@ -221,7 +186,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 			keycode, record
 	);
 	update_oneshot(
-			&os_ctrl_state, KC_LCTL, OS_CTL,
+			&os_ctrl_state, KC_LCTL, OS_CTRL,
 			keycode, record
 	);
 	update_oneshot(