From fb79015049ebd1309cd4f69a7584db614f50d1db Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Fri, 31 Aug 2018 14:49:18 -0700
Subject: Keymap: Merlin Learns to QMK (#3820)

* Fix up my keymaps to use more QMK features

* update 60_ansi readme

* add the start of my userspace

* begin to use my new userspace

* use more of my userspace

* spread userspace love to my clueboard

* spread userspace love to 75 layout

* add a fairly vanilla readme

* put the FNX into a userspace incase I ever want to use it for something else

* respond to drashna's code review comments
---
 users/mechmerlin/readme.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 users/mechmerlin/readme.md

(limited to 'users/mechmerlin/readme.md')

diff --git a/users/mechmerlin/readme.md b/users/mechmerlin/readme.md
new file mode 100644
index 0000000000..6a76dd2a9d
--- /dev/null
+++ b/users/mechmerlin/readme.md
@@ -0,0 +1,3 @@
+# MechMerlin's Userspace
+
+This is a collection of my most commonly used QMK functions
-- 
cgit v1.2.3


From b11a776cef1d5e26e435ed6b4a12711c965abeb6 Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Fri, 26 Oct 2018 17:14:50 -0700
Subject: Keymap: Update userspace (I want my Hacktoberfest shirt!) (#4252)

* use ctl_t

* spruce up readme and add a changelog

* add comment about using CTL_T

* add more description

* use RSFT_T so I can still have a right shift key even on the _AL layer

* add config.h for rgblight_sleep

* update readme to talk about rgblight_sleep

* update changelog with new changes
---
 users/mechmerlin/readme.md | 41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

(limited to 'users/mechmerlin/readme.md')

diff --git a/users/mechmerlin/readme.md b/users/mechmerlin/readme.md
index 6a76dd2a9d..1e86a64107 100644
--- a/users/mechmerlin/readme.md
+++ b/users/mechmerlin/readme.md
@@ -1,3 +1,40 @@
-# MechMerlin's Userspace
+# MechMerlin's Userspace v0.1.1
 
-This is a collection of my most commonly used QMK functions
+This is a collection of my most commonly used QMK features. 
+
+A majority of my keyboards are smaller than 75%, ANSI, and staggered. 
+
+## Layers
+----
+
+### _BL (Base Layer)
+Typical standard QWERTY keymap.
+
+### _FL (Function Layer)
+This layer is commonly accessed via `MO(_FL)` on the base layer. It consists of your typical function key F1 through F12 and some RGB and Backlight controls. 
+
+### _AL (Arrow Layer)
+This layer is only present on my 60% boards. I habitually use the bottom right modifiers as arrows. 
+
+### _CL (Control Layer)
+This is not defined in here as it's present only on `LAYOUT_66` boards, or to be specific, my clueboard. It currently uses the default clueboard controls.
+
+## Custom Keycodes
+----
+
+### KC_FNX (Fn Extended)
+
+`KC_FNX` functions as a hold for `MO(X)` and tap for `TG(Y)`. Layer X and Y are different layers. 
+
+It is used primarily on my `LAYOUT_60_ansi` boards as my regular toggle (the 1u key to the right of right shift), is not present there. 
+
+### KC_CTCP (Control Caps)
+
+This is just a wrapper for `CTL_T(KC_CAPS)`. This is a hold for control and tap for caps lock. 
+
+## QMK Features
+----
+
+### RGBLIGHT_SLEEP
+
+Ensures that when my computer is in sleep mode, the keyboard underglow lights will also be off. 
-- 
cgit v1.2.3