Skip to content

Commit

Permalink
wip updating dependencies, cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
cosmicbuffalo committed Oct 25, 2024
1 parent 78f563e commit da9f511
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 95 deletions.
42 changes: 21 additions & 21 deletions config/combos.h
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
/* Right hand combos */
ZMK_COMBO(lbrc, &kp LBRC, RT1 RT2, DEF NUM)
ZMK_COMBO(lbkt, &kp LBKT, RM1 RM2, DEF NUM)
ZMK_COMBO(lpar, &kp LPAR, RB1 RB2, DEF NUM)
ZMK_COMBO(rbrc, &kp RBRC, RT2 RT3, DEF NUM)
ZMK_COMBO(rbkt, &kp RBKT, RM2 RM3, DEF NUM)
ZMK_COMBO(rpar, &kp RPAR, RB2 RB3, DEF NUM)
ZMK_COMBO(at, &kp AT, RM1 RM3, DEF)
ZMK_COMBO(hash, &kp HASH, RB1 RB3, DEF)
ZMK_COMBO(grave, &kp GRAVE, RT1 RT3, DEF)
/*ZMK_COMBO(lbrc, &kp LBRC, RT1 RT2, DEF NUM)*/
/*ZMK_COMBO(lbkt, &kp LBKT, RM1 RM2, DEF NUM)*/
/*ZMK_COMBO(lpar, &kp LPAR, RB1 RB2, DEF NUM)*/
/*ZMK_COMBO(rbrc, &kp RBRC, RT2 RT3, DEF NUM)*/
/*ZMK_COMBO(rbkt, &kp RBKT, RM2 RM3, DEF NUM)*/
/*ZMK_COMBO(rpar, &kp RPAR, RB2 RB3, DEF NUM)*/
/*ZMK_COMBO(at, &kp AT, RM1 RM3, DEF)*/
/*ZMK_COMBO(hash, &kp HASH, RB1 RB3, DEF)*/
/*ZMK_COMBO(grave, &kp GRAVE, RT1 RT3, DEF)*/

/* Left hand combos */
ZMK_COMBO(spectacle_full, SPC_FULL, LT2 LT1, NAV SYM FN)
ZMK_COMBO(spectacle_move, SPC_MVR, LB2 LB1, NAV SYM FN)
/*ZMK_COMBO(spectacle_full, SPC_FULL, LT2 LT1, NAV SYM FN)*/
/*ZMK_COMBO(spectacle_move, SPC_MVR, LB2 LB1, NAV SYM FN)*/

ZMK_COMBO(bang, &kp EXCL, LT2 LT1, DEF NUM)
ZMK_COMBO(equals, &kp EQUAL, LM2 LM1, DEF NUM)
ZMK_COMBO(amps, &kp AMPS, LB2 LB1, DEF NUM)
ZMK_COMBO(gt, &kp GT, LT3 LT2, DEF NUM)
ZMK_COMBO(plus, &kp PLUS, LM3 LM2, DEF NUM)
ZMK_COMBO(pipe, &kp PIPE, LB3 LB2, DEF NUM)
ZMK_COMBO(lt, &kp LT, LT3 LT1, DEF NUM)
ZMK_COMBO(minus, &kp MINUS, LM3 LM1, DEF NUM)
ZMK_COMBO(star, &kp STAR, LB3 LB1, DEF NUM)
/*ZMK_COMBO(bang, &kp EXCL, LT2 LT1, DEF NUM)*/
/*ZMK_COMBO(equals, &kp EQUAL, LM2 LM1, DEF NUM)*/
/*ZMK_COMBO(amps, &kp AMPS, LB2 LB1, DEF NUM)*/
/*ZMK_COMBO(gt, &kp GT, LT3 LT2, DEF NUM)*/
/*ZMK_COMBO(plus, &kp PLUS, LM3 LM2, DEF NUM)*/
/*ZMK_COMBO(pipe, &kp PIPE, LB3 LB2, DEF NUM)*/
/*ZMK_COMBO(lt, &kp LT, LT3 LT1, DEF NUM)*/
/*ZMK_COMBO(minus, &kp MINUS, LM3 LM1, DEF NUM)*/
/*ZMK_COMBO(star, &kp STAR, LB3 LB1, DEF NUM)*/

/* Cross combos */

/* both home index fingers: shortcat */
ZMK_COMBO(shortcat, SHRTCAT, LM1 RM1, DEF)
/*ZMK_COMBO(shortcat, SHRTCAT, LM1 RM1, DEF)*/

29 changes: 4 additions & 25 deletions config/custom_behaviors.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,27 +53,6 @@ ZMK_BEHAVIOR(comma_inner_morph, mod_morph,
mods = <(MOD_LCTL|MOD_RCTL)>;
)

// tap: 1 | shift + tap: lparen
ZMK_BEHAVIOR(n1_morph, mod_morph,
mods = <(MOD_LSFT|MOD_RSFT)>;
bindings = <&kp N1>, <&kp LPAR>;
)
// tap: 2 | shift + tap: rparen
ZMK_BEHAVIOR(n2_morph, mod_morph,
mods = <(MOD_LSFT|MOD_RSFT)>;
bindings = <&kp N2>, <&kp RPAR>;
)
// tap: 4 | shift + tap: lbracket
ZMK_BEHAVIOR(n4_morph, mod_morph,
mods = <(MOD_LSFT|MOD_RSFT)>;
bindings = <&kp N4>, <&kp LBKT>;
)
// tap: 5 | shift + tap: rbracket
ZMK_BEHAVIOR(n5_morph, mod_morph,
mods = <(MOD_LSFT|MOD_RSFT)>;
bindings = <&kp N5>, <&kp RBKT>;
)

// tap: dot | shift + tap: colon | ctrl + shift + tap: >
ZMK_BEHAVIOR(dot_morph, mod_morph,
bindings = <&kp DOT>, <&dot_inner_morph>;
Expand All @@ -85,10 +64,10 @@ ZMK_BEHAVIOR(dot_inner_morph, mod_morph,
)

// tap: qmark | shift + tap: excl
ZMK_BEHAVIOR(qexcl, mod_morph,
bindings = <&kp QMARK>, <&kp EXCL>;
mods = <(MOD_LSFT|MOD_RSFT)>;
)
/*ZMK_BEHAVIOR(qexcl, mod_morph,*/
/* bindings = <&kp QMARK>, <&kp EXCL>;*/
/* mods = <(MOD_LSFT|MOD_RSFT)>;*/
/*)*/


// tap: space | shift + tap: underscore | hold: activate layer
Expand Down
1 change: 1 addition & 0 deletions config/totem.keymap
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include "totem_keypos.h"
#include "zmk_helper.h"
#include "zmk-helpers/helper.h"

#include "mouse.h"

Expand Down
22 changes: 20 additions & 2 deletions config/west.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
manifest:
remotes:
- name: zmkfirmware
- name: upstream
url-base: https://github.com/zmkfirmware
- name: urob
url-base: https://github.com/urob
- name: rafaelromao
url-base: https://github.com/rafaelromao
- name: ssbb
url-base: https://github.com/ssbb
- name: dhruvinsh
url-base: https://github.com/dhruvinsh
projects:
- name: zmk
remote: urob
revision: main
revision: going-modular
import: app/west.yml
- name: zmk-antecedent-morph
remote: ssbb
revision: v1
- name: zmk-tri-state
remote: dhruvinsh
revision: main
- name: zmk-auto-layer
remote: urob
revision: main
- name: zmk-helpers
remote: urob
revision: main
self:
path: config
47 changes: 0 additions & 47 deletions config/zmk_helper.h

This file was deleted.

0 comments on commit da9f511

Please sign in to comment.