Merge branch 'master' into topic-low-hanging-fruit

This commit is contained in:
Josh Klar
2018-10-11 20:42:03 -07:00
committed by GitHub
7 changed files with 16 additions and 16 deletions

View File

@@ -16,7 +16,7 @@ diode_orientation = DiodeOrientation.COLUMNS
unicode_mode = UnicodeModes.LINUX
tap_time = 200
leader_timeout = 2000
DEBUG_ENABLE = True
debug_enable = True
emoticons = AttrDict({
# Emoticons, but fancier
@@ -35,7 +35,7 @@ for k, v in emoticons.items():
# ---------------------- Leader Key Macros --------------------------------------------
LEADER_DICTIONARY = {
leader_dictionary = {
(KC.F, KC.L, KC.I, KC.P): emoticons.ANGRY_TABLE_FLIP,
(KC.C, KC.H, KC.E, KC.E, KC.R): emoticons.CHEER,
(KC.W, KC.A, KC.T): emoticons.WAT,

View File

@@ -18,7 +18,7 @@ diode_orientation = DiodeOrientation.COLUMNS
unicode_mode = UnicodeModes.LINUX
tap_time = 150
leader_timeout = 2000
DEBUG_ENABLE = False
debug_enable = False
# -------------------------------Macros -----------------------------------------------
@@ -41,7 +41,7 @@ for k, v in emoticons.items():
# ---------------------- Leader Key Macros --------------------------------------------
gc.collect()
LEADER_DICTIONARY = {
leader_dictionary = {
(KC.F, KC.L, KC.I, KC.P): emoticons.ANGRY_TABLE_FLIP,
(KC.C, KC.H, KC.E, KC.E, KC.R): emoticons.CHEER,
(KC.W, KC.A, KC.T): emoticons.WAT,