Re-add x and q

SofusA · Jan 29, 2025 · 5794c62 · 5794c62
1 parent adfa59f
commit 5794c62
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,6 @@
 
 This is my configuration with 3 Nice!Nanos: One connected through usb working as a dongle, and one for each keyboard split.
 
-Using a modified 28 key colemak-dh with danish letters layout.
+Using a modified 30 key colemak-dh with danish letters layout.
 
 Using the mouse key pull request branch.
diff --git a/config/boards/shields/sweeple/sweeple.keymap b/config/boards/shields/sweeple/sweeple.keymap
@@ -87,18 +87,6 @@
             layers = <0>;
             bindings = <&kp SQT>; 
         };
-        combo_x {
-            timeout-ms = <30>;
-            key-positions = <11 12>; 
-            layers = <0>;
-            bindings = <&kp X>; 
-        };
-        combo_q {
-            timeout-ms = <30>;
-            key-positions = <21 22>; 
-            layers = <0>;
-            bindings = <&kp Q>; 
-        };
     };
 
     keymap {
@@ -110,9 +98,9 @@
         //├──────────┼──────────┼──────────┼──────────┼──────────┤   ├──────────┼──────────┼──────────┼──────────┼──────────┤
             &kp A      &kp R      &kp S      &kp T      &kp G          &kp M      &kp N      &kp E      &kp I      &kp O
         //├──────────┼──────────┼──────────┼──────────┼──────────┤   ├──────────┼──────────┼──────────┼──────────┼──────────┤
-            &kp Z      &kp V      &kp C      &kp D      &trans         &trans     &kp H      &kp K      &kp B      &kp J
+            &kp Z      &kp V      &kp C      &kp D      &kp X          &kp Q      &kp H      &kp K      &kp B      &kp J
         //╰──────────┴──────────┴──────────┼──────────┼──────────┤   ├──────────┼──────────┼──────────┴──────────┴──────────╯
-                                           &lt 4 SPACE  &lt 5 ESC      &htl 3 1   &kp BSPC
+                                      &mt LSHIFT SPACE  &lt 4 ESC      &htl 3 1   &kp BSPC
         //                                 ╰──────────┴──────────╯   ╰──────────┴──────────╯
             >;
         };
@@ -168,23 +156,6 @@
             >;
         };
 
-        mouse_layer {
-            bindings = <
-        //╭──────────┬──────────┬──────────┬──────────┬──────────╮   ╭──────────┬──────────┬──────────┬──────────┬──────────╮
-        //│          │          │          │          │          │   │          │          │          │          │          │
-            &trans    &msc SCRL_UP &kp SPACE &msc SCRL_DOWN &trans     &trans     &trans   &mmv MOVE_UP &trans     &trans
-        //├──────────┼──────────┼──────────┼──────────┼──────────┤   ├──────────┼──────────┼──────────┼──────────┼──────────┤
-        //│          │          │          │          │          │   │          │          │          │          │          │
-            &kp LSHIFT &mkp LCLK  &mkp MCLK  &mkp RCLK  &trans         &trans  &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_RIGHT  &trans     
-        //├──────────┼──────────┼──────────┼──────────┼──────────┤   ├──────────┼──────────┼──────────┼──────────┼──────────┤
-        //│          │          │          │          │          │   │          │          │          │          │          │
-            &trans     &trans     &kp LALT   &trans     &trans         &trans     &trans     &trans     &trans     &trans
-        //╰──────────┴──────────┴──────────┼──────────┼──────────┤   ├──────────┼──────────┼──────────┴──────────┴──────────╯
-                                             &trans     &trans         &trans     &kp LCTRL
-        //                                 ╰──────────┴──────────╯   ╰──────────┴──────────╯
-            >;
-        };
-
         shortcut_layer {
             bindings = <
         //╭──────────┬──────────┬──────────┬──────────┬──────────╮   ╭──────────┬──────────┬──────────┬──────────┬──────────╮

diff --git a/config/west.yml b/config/west.yml
@@ -1,11 +1,11 @@
 manifest:
   remotes:
     - name: zmkfirmware
-      url-base: https://github.com/petejohanson
+      url-base: https://github.com/zmkfirmware
   projects:
     - name: zmk
       remote: zmkfirmware
-      revision: feat/pointers-move-scroll
+      revision: main
       import: app/west.yml
   self:
     path: config