Merge remote-tracking branch 'origin/master' into develop

1 files changed, 34 insertions, 4 deletions

diff --git a/users/hvp/hvp.h b/users/hvp/hvp.h
index b016da9e25..275838a49a 100644
--- a/users/hvp/hvp.h
+++ b/users/hvp/hvp.h
@@ -1,13 +1,43 @@
+ /* Copyright 2021 hvp
+  * 
+  * 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/>. 
+  */ 
+
+
 #pragma once
+#include "quantum.h"
+#undef TAPPING_TERM
+#define TAPPING_TERM 150
 
 #ifdef TAP_DANCE_ENABLE
 #    include "tap_dances.h"
 #endif
-#include "quantum.h"
 
-#undef TAPPING_TERM
-#define TAPPING_TERM 150
+#ifdef TAPPING_TERM_PER_KEY
+#    include "per_key.h"
+#endif
 
-// Keys 
 
 #define D_NAVI MT(MOD_LCTL | MOD_LSFT, KC_D)
+
+/* Home-row mods */
+#define LG_A MT(MOD_LGUI, KC_A)
+#define LA_S MT(MOD_LALT, KC_S)
+#define LS_D MT(MOD_LSFT, KC_D)
+#define LC_F MT(MOD_LCTL, KC_F)
+
+#define RC_H MT(MOD_RCTL, KC_H)
+#define RS_J MT(MOD_RSFT, KC_J)
+#define RA_K MT(MOD_RALT, KC_K)
+#define RG_L MT(MOD_RGUI, KC_L)
\ No newline at end of file