Change home row modifiers to regular keys

users/paullemmens/paullemmens.h

@@ -33,45 +33,61 @@
 #define _GRAVE_     ALGR(KC_GRAVE)
 #define _UMLAU_     ALGR(S(KC_QUOTE))
 #define _CIRCFL     ALGR(KC_CIRC)
-// Home row mods
+// old home row mods
 #define LGUI__Z     LGUI_T(KC_Z)
 #define Z_LCTRL     LCTL_T(KC_Z)
 #define G_LSHFT     LSFT_T(KC_G)
 #define V_LSHFT     LSFT_T(KC_V)
-#define V_LCTRL     LCTL_T(KC_V)
-#define B_LCTRL     LCTL_T(KC_B)
-#define V__LCMD     LCMD_T(KC_V)
 #define N_RSHFT     RSFT_T(KC_N)
-#define N_RCTRL     RCTL_T(KC_N)
 #define M_RSHFT     RSFT_T(KC_M)
-#define M_RCTRL     RCTL_T(KC_M)
-#define M__RCMD     RCMD_T(KC_M)
 #define D_LCTRL     LCTL_T(KC_D)
-#define D_LSHFT     LSFT_T(KC_D)
-#define K_RCTRL     RCTL_T(KC_K)
-#define K_RSHFT     RSFT_T(KC_K)
-#define S__LALT     LALT_T(KC_S)
-#define L__LALT     LALT_T(KC_L)
 #define BS_LALT     LALT_T(KC_BSPC)
 #define ENT_RSF     RSFT_T(KC_ENT)
 // Layer toggles
-#define R_ADJST     LT(_ADJUST, KC_R)
-#define F_RAISE     LT(_RAISE, KC_F)
 #define SPC_LWR     LT(_LOWER, KC_SPC)
 #ifdef CALLUM_ONESHOT
     // TODO: change to something fancy some how to keep keep layer switch in there for key movement.
-    // FIXME: change the KC_LCTRL/_LCMD to new os mods layer
     // FIXME: figure out smart way for adjusting to macos vs windows so I don't need the extra layer no more
     #define OS_LCMD     MO(_OS_MODS)
+    #define B_LCTRL     KC_B
+    #define D_LSHFT     KC_D
+    #define G_LOWER     KC_G
+    #define F_RAISE     KC_F
+    #define H_LOWER     KC_H
+    #define J_RAISE     KC_J
+    #define K_RSHFT     KC_K
+    #define K_RCTRL     KC_K
+    #define L__LALT     KC_L
+    #define M_RCTRL     KC_M
+    #define M__RCMD     KC_M
+    #define N_RCTRL     KC_N
+    #define R_ADJST     KC_R
+    #define S__LALT     KC_S
+    #define U_ADJST     KC_U
+    #define V_LCTRL     KC_V
+    #define V__LCMD     KC_V
 #else
     #define OS_LCMD     KC_LCMD
+    #define B_LCTRL     LCTL_T(KC_B)
+    #define D_LSHFT     LSFT_T(KC_D)
+    #define F_RAISE     LT(_RAISE, KC_F)
+    #define H_LOWER     LT(_LOWER, KC_H)
+    #define G_LOWER     LT(_LOWER, KC_G)
+    #define J_RAISE     LT(_RAISE, KC_J)
+    #define K_RSHFT     RSFT_T(KC_K)
+    #define K_RCTRL     RCTL_T(KC_K)
+    #define L__LALT     LALT_T(KC_L)
+    #define M_RCTRL     RCTL_T(KC_M)
+    #define M__RCMD     RCMD_T(KC_M)
+    #define N_RCTRL     RCTL_T(KC_N)
+    #define R_ADJST     LT(_ADJUST, KC_R)
+    #define S__LALT     LALT_T(KC_S)
+    #define U_ADJST     LT(_ADJUST, KC_U)
+    #define V_LCTRL     LCTL_T(KC_V)
+    #define V__LCMD     LCMD_T(KC_V)
 #endif
 #define DEL_RAI     LT(_RAISE, KC_DEL)
 #define ESC_RAI     LT(_RAISE, KC_ESC)
-#define H_LOWER     LT(_LOWER, KC_H)
-#define G_LOWER     LT(_LOWER, KC_G)
-#define J_RAISE     LT(_RAISE, KC_J)
-#define U_ADJST     LT(_ADJUST, KC_U)
 #define MACOS_L     DF(_MACOS)
 #define DEFAU_L     DF(_QWERTY)