From 9e1e31a1425901a61b918b203cf3360082995621 Mon Sep 17 00:00:00 2001
From: Fred Silberberg <fred@silberberg.xyz>
Date: Mon, 20 Apr 2020 03:00:14 -0700
Subject: [PATCH] Add naked60 layout, clean up my userspace files and rules.mk.
 (#8848)

---
 layouts/community/ergodox/333fred/config.h    | 1 -
 layouts/community/ergodox/333fred/rules.mk    | 2 --
 layouts/community/ortho_5x12/333fred/config.h | 2 --
 layouts/community/ortho_5x12/333fred/rules.mk | 2 --
 users/333fred/{333fred_config.h => config.h}  | 1 +
 users/333fred/rules.mk                        | 4 ++++
 6 files changed, 5 insertions(+), 7 deletions(-)
 rename users/333fred/{333fred_config.h => config.h} (69%)

diff --git a/layouts/community/ergodox/333fred/config.h b/layouts/community/ergodox/333fred/config.h
index 82255e05ec71..5a91ea3aa4e5 100644
--- a/layouts/community/ergodox/333fred/config.h
+++ b/layouts/community/ergodox/333fred/config.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include QMK_KEYBOARD_CONFIG_H
-#include "333fred_config.h"
 
 #undef TAPPING_TERM
 #define TAPPING_TERM 200
diff --git a/layouts/community/ergodox/333fred/rules.mk b/layouts/community/ergodox/333fred/rules.mk
index 1549bcfc84dd..f6c71feb4627 100644
--- a/layouts/community/ergodox/333fred/rules.mk
+++ b/layouts/community/ergodox/333fred/rules.mk
@@ -1,7 +1,5 @@
 LCD_BACKLIGHT_ENABLE = yes
 LCD_ENABLE = yes
 BACKLIGHT_ENABLE = yes
-NKRO_ENABLE = yes
 KEY_LOCK_ENABLE = yes
-TAP_DANCE_ENABLE = yes
 CONSOLE_ENABLE = no
diff --git a/layouts/community/ortho_5x12/333fred/config.h b/layouts/community/ortho_5x12/333fred/config.h
index 7835fa1f07d9..2e5dfe2e297b 100644
--- a/layouts/community/ortho_5x12/333fred/config.h
+++ b/layouts/community/ortho_5x12/333fred/config.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "333fred_config.h"
-
 #define USE_SERIAL
 #define MASTER_LEFT
 
diff --git a/layouts/community/ortho_5x12/333fred/rules.mk b/layouts/community/ortho_5x12/333fred/rules.mk
index 0cfb234665e8..9a3e2b97e594 100644
--- a/layouts/community/ortho_5x12/333fred/rules.mk
+++ b/layouts/community/ortho_5x12/333fred/rules.mk
@@ -1,4 +1,2 @@
 KEY_LOCK_ENABLE = yes
-NKRO_ENABLE = yes
 CONSOLE_ENABLE = no
-TAP_DANCE_ENABLE = yes
diff --git a/users/333fred/333fred_config.h b/users/333fred/config.h
similarity index 69%
rename from users/333fred/333fred_config.h
rename to users/333fred/config.h
index c099072fc7f2..5974b7892654 100644
--- a/users/333fred/333fred_config.h
+++ b/users/333fred/config.h
@@ -2,3 +2,4 @@
 
 #define PERMISSIVE_HOLD
 #define NO_ACTION_MACRO
+#undef  ONESHOT_TAP_TOGGLE
diff --git a/users/333fred/rules.mk b/users/333fred/rules.mk
index 0e2cc2588cc5..191422e365f3 100644
--- a/users/333fred/rules.mk
+++ b/users/333fred/rules.mk
@@ -3,3 +3,7 @@ SRC += 333fred.c
 ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
   SRC += rgb.c
 endif
+
+TAP_DANCE_ENABLE=yes
+NKRO_ENABLE = yes
+PERMISSIVE_HOLD = yes