Update personal colemak Iris layout and deleted redundant folders (#2794)

* DRambo Planck keymap in Colemak

* DRambo Planck keymap in Colemak

* Satan GH60 keymap for Bri

QWERTY layout with Navigation layer toggled with "Caps Lock" key.

* xd75 keymap in Colemak for Mac and Win

* DRambo Planck keymap in Colemak

* Satan GH60 keymap for Bri

QWERTY layout with Navigation layer toggled with "Caps Lock" key.

* xd75 keymap in Colemak for Mac and Win

* Added Iris Colemak layout for Mac, Windows, and Gaming.

* changed comment text

* DRambo Planck keymap in Colemak

* Satan GH60 keymap for Bri

QWERTY layout with Navigation layer toggled with "Caps Lock" key.

* xd75 keymap in Colemak for Mac and Win

* Added Iris Colemak layout for Mac, Windows, and Gaming.

* changed comment text

* Added Iris keymap from DavidRambo

* Added planck keymap from DavidRambo

* Added xd75 keymap from DavidRambo

* Added readme

* Deleted redundant repos in Iris, Planck, and XD75 keymaps.

* Tweaked XD75 keymap

* DRambo Planck keymap in Colemak

* Tweaked XD75 keymap

* Merge branch 'master' of https://github.com/DavidRambo/qmk_firmware

Removed redundant repos with "Rambo" title.

* changed iris nav layers

* changed nav layers for xd75

* Updated Iris, tweaked nav on xd75

5 files changed, 15 insertions, 228 deletions

diff --git a/keyboards/iris/keymaps/davidrambo/keymap.c b/keyboards/iris/keymaps/davidrambo/keymap.c
index 31ec3eba1..40f0d0145 100644
--- a/keyboards/iris/keymaps/davidrambo/keymap.c
+++ b/keyboards/iris/keymaps/davidrambo/keymap.c
@@ -5,12 +5,12 @@
 extern keymap_config_t keymap_config;
 
 //keycode shorthands
-#define KC____  KC_TRNS
+#define KC____  KC_TRNS // three underscores "___" for transparent
 #define KC_SYM  MO(3)
 #define KC_MAC  TO(0)
 #define KC_PC   TO(1)
 #define KC_GM   TO(2)
-#define KC_NAV  LT(4, KC_TAB)
+#define KC_NAVMAC LT(4, KC_TAB)
 #define KC_NAVPC  LT(5, KC_TAB)
 
 //text editor shortcuts for NAV and NAVPC
@@ -18,8 +18,8 @@ extern keymap_config_t keymap_config;
 #define KC_AR   LALT(KC_RGHT)
 #define KC_CL   LCTL(KC_LEFT)
 #define KC_CR   LCTL(KC_RGHT)
-#define KC_A_BS LALT(KC_BSPC)
-#define KC_C_BS LALT(KC_BSPC)
+#define KC_ABSPC LALT(KC_BSPC)
+#define KC_CBSPC LCTL(KC_BSPC)
 
 //internet browser tab shortcuts and window swapping for Mac and Windows
 #define KC_GSL  LGUI(S(KC_LEFT))
@@ -38,7 +38,7 @@ extern keymap_config_t keymap_config;
 #define _PC 1
 #define _GAME 2
 #define _SYMBOL 3
-#define _NAV 4
+#define _NAVMAC 4
 #define _NAVPC 5
 
 enum {
@@ -56,13 +56,13 @@ enum {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[_COLEMAK] = KC_KEYMAP(
+	[_COLEMAK] = LAYOUT_kc(
   //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
      ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,MINS,
   //|----+----+----+----+----+----|              |----+----+----+----+----+----|
      GRV , Q  , W  , F  , P  , G  ,                J  , L  , U  , Y  ,SCLN,BSPC,
   //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     NAV , A  , R  , S  , T  , D  ,                H  , N  , E  , I  , O  ,QUOT,
+   NAVMAC, A  , R  , S  , T  , D  ,                H  , N  , E  , I  , O  ,QUOT,
   //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
      SFLK, Z  , X  , C  , V  , B  , PC ,     ENT , K  , M  ,COMM, DOT,SLSH,RSFT,
   //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //                  `----+----+----'        `----+----+----'
   ),
 
-    [_PC] = KC_KEYMAP(
+    [_PC] = LAYOUT_kc(
     ___ , ___ , ___ , ___ , ___ , ___ ,          ___ , ___ , ___ , ___ , ___ , ___ ,
         
     ___ , ___ , ___ , ___ , ___ , ___ ,          ___ , ___ , ___ , ___ , ___ , ___ ,
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                       LGUI , LCTL , CTBS ,    ___ , ___ , ___ 
     ),
    
-    [_GAME] = KC_KEYMAP(
+    [_GAME] = LAYOUT_kc(
     ___ , ___ , ___ , ___ , ___ , ___ ,          ___ , ___ , ___ , ___ , ___ , ___ ,
         
     ___ ,  T  ,  Q  ,  W  ,  E  ,  R  ,          ___ , ___ , ___ , ___ , ___ , ___ ,
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         LALT , LALT , SPC,    BSPC, MAC, ___ 
     ), 
     
-    [_SYMBOL] = KC_KEYMAP(
+    [_SYMBOL] = LAYOUT_kc(
     
     ___ , ___ , ___ , ___ , ___ , ___ ,         ___ , ___ , ___ , ___ , ___ , ___ ,
     
@@ -104,10 +104,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         
     ___ , HOME, END , VOLD, VOLU, MPLY,___,  ___,___, MINS, ___ , ___ , ___ , ___ , 
         
-                        ___ , ___ , A_BS,      ___, ___ , ___ 
+                        ___ , ___ , ___,      ___, ___ , ___ 
     ),
    
-    [_NAV] = KC_KEYMAP(
+    [_NAVMAC] = LAYOUT_kc(
     
     ___ , ___ , ___ , ___ , ___ , ___ ,         ___ , ___ , ___ , ___ , ___ , ___ ,
         
@@ -115,12 +115,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         
     ___ , ___ , ___ , ___ , ___ , ___ ,         GSL , LEFT, DOWN, RGHT, GSR , ___ ,
         
-    ___ , ___ , ___ , ___ , ___ , ___ ,___,  ___,G_TAB, ___ , ___ , ___ , ___ , ___ , 
+    ___ , ___ , ___ , ___ , ___ , ___ ,___,  ___,G_TAB,ABSPC, ___ , ___ , ___ , ___ , 
         
                         ___ , ___ , ___ ,       ___ , ___ , ___ 
     ),
     
-    [_NAVPC] = KC_KEYMAP(
+    [_NAVPC] = LAYOUT_kc(
     
     ___ , ___ , ___ , ___ , ___ , ___ ,         ___ , ___ , ___ , ___ , ___ , ___ ,
         
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         
     ___ , ___ , ___ , ___ , ___ , ___ ,         CPGU, LEFT, DOWN, RGHT, CPGD, ___ ,
         
-    ___ , ___ , ___ , ___ , ___ , ___ ,___,  ___,A_TAB, ___ , ___ , ___ , ___ , ___ , 
+    ___ , ___ , ___ , ___ , ___ , ___ ,___,  ___,A_TAB,CBSPC, ___ , ___ , ___ , ___ , 
         
                         ___ , ___ , ___ ,       ___ , ___ , ___ 
     ),
diff --git a/keyboards/iris/keymaps/dnrambo/config.h b/keyboards/iris/keymaps/dnrambo/config.h
deleted file mode 100644
index 01e078e32..000000000
--- a/keyboards/iris/keymaps/dnrambo/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "config_common.h"
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
-/* Select hand configuration */
-#define PERMISSIVE_HOLD
-#define PREVENT_STUCK_MODIFIERS
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-/*
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-*/
-#define TAPPING_TERM 200
-#include "../../config.h"
-
-#endif
diff --git a/keyboards/iris/keymaps/dnrambo/keymap.c b/keyboards/iris/keymaps/dnrambo/keymap.c
deleted file mode 100644
index 31ec3eba1..000000000
--- a/keyboards/iris/keymaps/dnrambo/keymap.c
+++ /dev/null
@@ -1,158 +0,0 @@
-#include "iris.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-
-extern keymap_config_t keymap_config;
-
-//keycode shorthands
-#define KC____  KC_TRNS
-#define KC_SYM  MO(3)
-#define KC_MAC  TO(0)
-#define KC_PC   TO(1)
-#define KC_GM   TO(2)
-#define KC_NAV  LT(4, KC_TAB)
-#define KC_NAVPC  LT(5, KC_TAB)
-
-//text editor shortcuts for NAV and NAVPC
-#define KC_AL   LALT(KC_LEFT)
-#define KC_AR   LALT(KC_RGHT)
-#define KC_CL   LCTL(KC_LEFT)
-#define KC_CR   LCTL(KC_RGHT)
-#define KC_A_BS LALT(KC_BSPC)
-#define KC_C_BS LALT(KC_BSPC)
-
-//internet browser tab shortcuts and window swapping for Mac and Windows
-#define KC_GSL  LGUI(S(KC_LEFT))
-#define KC_GSR  LGUI(S(KC_RGHT))
-#define KC_CPGD LCTL(KC_PGDN)
-#define KC_CPGU LCTL(KC_PGUP)
-
-#define KC_CMBS  GUI_T(KC_BSPC)
-#define KC_CTBS  CTL_T(KC_BSPC)
-#define KC_C_TAB LCTL(KC_TAB)
-#define KC_G_TAB LGUI(KC_TAB)
-#define KC_A_TAB LALT(KC_TAB)
-
-//layer shorthands
-#define _COLEMAK 0
-#define _PC 1
-#define _GAME 2
-#define _SYMBOL 3
-#define _NAV 4
-#define _NAVPC 5
-
-enum {
-//	SFT_LCK //tapdance declarations
-    COLEMAK = 0,
-    PC,
-    GAME,
-    SYMBOL,
-    NAV, //Navigation layer for Mac Colemak
-    NAVPC, //Navigation layer for PC Colemak
-    SFT_LCK //tapdance declaration
-};
-
-#define KC_SFLK TD(SFT_LCK)     // alias for tapdance
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[_COLEMAK] = KC_KEYMAP(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,MINS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     GRV , Q  , W  , F  , P  , G  ,                J  , L  , U  , Y  ,SCLN,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     NAV , A  , R  , S  , T  , D  ,                H  , N  , E  , I  , O  ,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     SFLK, Z  , X  , C  , V  , B  , PC ,     ENT , K  , M  ,COMM, DOT,SLSH,RSFT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LCTL,LGUI,CMBS,         SPC, SYM, LALT
-  //                  `----+----+----'        `----+----+----'
-  ),
-
-    [_PC] = KC_KEYMAP(
-    ___ , ___ , ___ , ___ , ___ , ___ ,          ___ , ___ , ___ , ___ , ___ , ___ ,
-        
-    ___ , ___ , ___ , ___ , ___ , ___ ,          ___ , ___ , ___ , ___ , ___ , ___ ,
-        
-    NAVPC,___ , ___ , ___ , ___ , ___ ,          ___ , ___ , ___ , ___ , ___ , ___ ,
-        
-    ___ , ___ , ___ , ___ , ___ , ___ , GM, ___, ___ , ___ , ___ , ___ , ___ , ___ , 
-        
-                      LGUI , LCTL , CTBS ,    ___ , ___ , ___ 
-    ),
-   
-    [_GAME] = KC_KEYMAP(
-    ___ , ___ , ___ , ___ , ___ , ___ ,          ___ , ___ , ___ , ___ , ___ , ___ ,
-        
-    ___ ,  T  ,  Q  ,  W  ,  E  ,  R  ,          ___ , ___ , ___ , ___ , ___ , ___ ,
-        
-    TAB , LSFT,  A  ,  S  ,  D  ,  F  ,          ___ , ___ , ___ , ___ , ___ , ___ ,
-        
-     I  , LCTL,  Z  ,  X  ,  C  ,  V  ,  M,   P , ___, ___ , ___ , ___ , ___ , ___ , 
-        
-                        LALT , LALT , SPC,    BSPC, MAC, ___ 
-    ), 
-    
-    [_SYMBOL] = KC_KEYMAP(
-    
-    ___ , ___ , ___ , ___ , ___ , ___ ,         ___ , ___ , ___ , ___ , ___ , ___ ,
-    
-    LBRC,  1  ,  2  ,  3  ,  4  ,  5  ,          6  ,  7  ,  8  ,  9  ,  0  , RBRC,
-        
-    BSLS, EXLM, AT  , HASH, DLR , PERC,         CIRC, AMPR, ASTR, LPRN, RPRN, EQL ,
-        
-    ___ , HOME, END , VOLD, VOLU, MPLY,___,  ___,___, MINS, ___ , ___ , ___ , ___ , 
-        
-                        ___ , ___ , A_BS,      ___, ___ , ___ 
-    ),
-   
-    [_NAV] = KC_KEYMAP(
-    
-    ___ , ___ , ___ , ___ , ___ , ___ ,         ___ , ___ , ___ , ___ , ___ , ___ ,
-        
-    ___ , ___ , ___ , ___ , ___ , ___ ,         C_TAB, AL ,  UP ,  AR , DEL , ___ ,
-        
-    ___ , ___ , ___ , ___ , ___ , ___ ,         GSL , LEFT, DOWN, RGHT, GSR , ___ ,
-        
-    ___ , ___ , ___ , ___ , ___ , ___ ,___,  ___,G_TAB, ___ , ___ , ___ , ___ , ___ , 
-        
-                        ___ , ___ , ___ ,       ___ , ___ , ___ 
-    ),
-    
-    [_NAVPC] = KC_KEYMAP(
-    
-    ___ , ___ , ___ , ___ , ___ , ___ ,         ___ , ___ , ___ , ___ , ___ , ___ ,
-        
-    ___ , ___ , ___ , ___ , ___ , ___ ,         C_TAB, CL ,  UP ,  CR , DEL , ___ ,
-        
-    ___ , ___ , ___ , ___ , ___ , ___ ,         CPGU, LEFT, DOWN, RGHT, CPGD, ___ ,
-        
-    ___ , ___ , ___ , ___ , ___ , ___ ,___,  ___,A_TAB, ___ , ___ , ___ , ___ , ___ , 
-        
-                        ___ , ___ , ___ ,       ___ , ___ , ___ 
-    ),
-   
-};
-
-// Shift vs. capslock function. From bbaserdem's Planck keymap.
-void caps_tap (qk_tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_code (KC_LSFT);
-    } else if (state->count == 2) {
-        unregister_code (KC_LSFT);
-        register_code (KC_CAPS);
-    }
-}
-void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        unregister_code (KC_LSFT);
-    } else {
-        unregister_code (KC_CAPS);
-    }
-}
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-    //Tap once for Shift, twice for Caps Lock
-    [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end)
-};
\ No newline at end of file
diff --git a/keyboards/iris/keymaps/dnrambo/readme.md b/keyboards/iris/keymaps/dnrambo/readme.md
deleted file mode 100644
index 4d21f37c0..000000000
--- a/keyboards/iris/keymaps/dnrambo/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Colemak layout for Iris rev2.1 with Mac and Windows layers and a Gaming Layer.
-# Symbol layer is based on my Planck layout, so it provides numbers, symbols, and volume controls.
-# Two Navigation layers, for Mac and Windows Colemak layers respectively.
\ No newline at end of file
diff --git a/keyboards/iris/keymaps/dnrambo/rules.mk b/keyboards/iris/keymaps/dnrambo/rules.mk
deleted file mode 100644
index 0b7e7b905..000000000
--- a/keyboards/iris/keymaps/dnrambo/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
-TAP_DANCE_ENABLE = yes
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif