moar stickerz

Signed-off-by: Christine Dodrill <me@christine.website>

moonlander/keymap.c

@@ -1,7 +1,7 @@
 #include QMK_KEYBOARD_H
 #include "config.h"
 #include "version.h"
-#include "keymap_steno.h"
+//#include "keymap_steno.h"
 #include "music.h"
 #include "g/keymap_combo.h"
 
@@ -24,7 +24,7 @@
 enum custom_keycodes {
   RGB_SLD = ML_SAFE_RANGE,
   HSV_172_255_255,
-  ST_MACRO_0,
+  CAD_SYSRQ,
   ST_MACRO_1,
   ST_MACRO_2,
   ST_MACRO_3,
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRANSPARENT, KC_Q,           KC_W,           KC_E,           KC_R,           KC_T,           KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_Y,           KC_U,           KC_I,           KC_O,           KC_P,           KC_TRANSPARENT,
     KC_TRANSPARENT, KC_A,           KC_S,           KC_D,           KC_F,           KC_G,           KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_H,           KC_J,           KC_K,           KC_L,           KC_SCOLON,      KC_TRANSPARENT,
     KC_TRANSPARENT, KC_Z,           KC_X,           KC_C,           KC_V,           KC_B,                                                                           KC_N,           KC_M,           KC_COMMA,       KC_DOT,         KC_SLASH,       KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LGUI,        KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
   ),
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     AU_TOG,         KC_NO,          KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     MU_TOG,         KC_TRANSPARENT, KC_TRANSPARENT, KC_MS_UP,       KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_UP,          KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     MU_MOD,         KC_TRANSPARENT, KC_MS_LEFT,     KC_MS_DOWN,     KC_MS_RIGHT,    KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_LEFT,        KC_DOWN,        KC_RIGHT,       KC_TRANSPARENT, KC_TRANSPARENT,
-    ST_MACRO_0,     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,
+    CAD_SYSRQ,     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,
     KC_TRANSPARENT, WEBUSB_PAIR,    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                 KC_TRANSPARENT, KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,  KC_TRANSPARENT, KC_TRANSPARENT,
     KC_MS_BTN1,     KC_MS_BTN3,     KC_MS_WH_DOWN,
     KC_MS_WH_UP,    KC_TRANSPARENT, KC_MS_BTN2
@@ -262,7 +262,7 @@ void rgb_matrix_indicators_user(void) {
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case ST_MACRO_0:
+    case CAD_SYSRQ:
     if (record->event.pressed) {
       SEND_STRING(SS_LALT(SS_TAP(X_PSCREEN)));
 
@@ -697,7 +697,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void matrix_init_user() {
-    steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT
+  //steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {

moonlander/leader.c

@@ -7,73 +7,29 @@ extern void combo_disable(void);
 
 LEADER_EXTERNS();
 
+const PROGMEM char* sticker_base = "https://cdn.christine.website/file/christine-static/stickers/";
+const PROGMEM char* sticker_extension = ".png\n";
+
+void send_sticker(const char* name) {
+  send_string(sticker_base);
+  send_string(name);
+  send_string(sticker_extension);
+}
+
 void matrix_scan_user(void) {
     LEADER_DICTIONARY() {
         leading = false;
         leader_end();
 
-        // Proxytags
-        SEQ_TWO_KEYS(KC_P, KC_C) { SEND_STRING("Cadey\\ "); }
-        SEQ_TWO_KEYS(KC_P, KC_N) { SEND_STRING("Nicole\\ "); }
-        SEQ_TWO_KEYS(KC_P, KC_J) { SEND_STRING("Jessie\\ "); }
-        SEQ_TWO_KEYS(KC_P, KC_A) { SEND_STRING("Ashe\\ "); }
-        SEQ_TWO_KEYS(KC_P, KC_S) { SEND_STRING("Sephie\\ "); }
-        SEQ_TWO_KEYS(KC_P, KC_M) { SEND_STRING("Mai\\ "); }
-
-        // Combos
-        SEQ_TWO_KEYS(KC_C, KC_D) { combo_disable(); }
-        SEQ_TWO_KEYS(KC_C, KC_E) { combo_enable(); }
-
-        /* // Autoshift */
-        /* SEQ_THREE_KEYS(KC_A, KC_S, KC_T) { autoshift_toggle(); } */
-        /* SEQ_THREE_KEYS(KC_A, KC_S, KC_E) { autoshift_enable(); } */
-        /* SEQ_THREE_KEYS(KC_A, KC_S, KC_D) { autoshift_disable(); } */
-
         // Go
         SEQ_TWO_KEYS(KC_G, KC_B) { SEND_STRING("go build" SS_TAP(X_ENTER)); }
         SEQ_THREE_KEYS(KC_G, KC_B, KC_A) { SEND_STRING("go build ./..." SS_TAP(X_ENTER)); }
         SEQ_TWO_KEYS(KC_G, KC_T) { SEND_STRING("go test" SS_TAP(X_ENTER)); }
         SEQ_THREE_KEYS(KC_G, KC_T, KC_A) { SEND_STRING("go test ./..." SS_TAP(X_ENTER)); }
 
-        // dwm
-        /// layouts
-        SEQ_THREE_KEYS(KC_D, KC_L, KC_F) { SEND_STRING(SS_LALT(SS_TAP(X_F))); }
-        SEQ_THREE_KEYS(KC_D, KC_L, KC_T) { SEND_STRING(SS_LALT(SS_TAP(X_T))); }
-        SEQ_THREE_KEYS(KC_D, KC_L, KC_M) { SEND_STRING(SS_LALT(SS_TAP(X_M))); }
-        SEQ_THREE_KEYS(KC_D, KC_L, KC_B) { SEND_STRING(SS_LALT(SS_TAP(X_U))); }
-        SEQ_THREE_KEYS(KC_D, KC_L, KC_O) { SEND_STRING(SS_LALT(SS_TAP(X_O))); }
-        /// spawn
-        SEQ_THREE_KEYS(KC_D, KC_S, KC_E) { SEND_STRING(SS_LALT(SS_TAP(X_E))); }
-        SEQ_THREE_KEYS(KC_D, KC_S, KC_T) { SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_ENTER)))); }
-        SEQ_TWO_KEYS(KC_D, KC_S) { SEND_STRING(SS_LALT(SS_TAP(X_P))); }
-        /// window management
-        SEQ_TWO_KEYS(KC_D, KC_C) { SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_C)))); }
-        SEQ_TWO_KEYS(KC_D, KC_ENTER) { SEND_STRING(SS_LALT(SS_TAP(X_ENTER))); }
-        /// dwm meta
-        SEQ_THREE_KEYS(KC_D, KC_Q, KC_L) { SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_Q)))); }
-
         // Nix
-        SEQ_TWO_KEYS(KC_N, KC_B) { SEND_STRING("nix-build"); }
-        SEQ_THREE_KEYS(KC_N, KC_B, KC_D) { SEND_STRING("nix-build docker.nix"); }
         SEQ_THREE_KEYS(KC_N, KC_O, KC_R) { SEND_STRING("sudo nixos-rebuild switch"); }
         SEQ_THREE_KEYS(KC_N, KC_O, KC_U) { SEND_STRING("sudo nixos-rebuild switch --upgrade"); }
-        SEQ_THREE_KEYS(KC_N, KC_N, KC_P) { SEND_STRING("lorri init; niv init; niv update nixpkgs -b nixpkgs-unstable"); }
-
-        // k8s
-        SEQ_THREE_KEYS(KC_K, KC_G, KC_D) { SEND_STRING("kubectl get deployments "); }
-        SEQ_THREE_KEYS(KC_K, KC_G, KC_P) { SEND_STRING("kubectl get pods "); }
-        SEQ_THREE_KEYS(KC_K, KC_G, KC_S) { SEND_STRING("kubectl get service "); }
-        SEQ_THREE_KEYS(KC_K, KC_G, KC_I) { SEND_STRING("kubectl get ingress "); }
-        SEQ_THREE_KEYS(KC_K, KC_G, KC_N) { SEND_STRING("kubectl get nodes -o wide "); }
-        SEQ_TWO_KEYS(KC_K, KC_L) { SEND_STRING("kubectl logs "); }
-        SEQ_THREE_KEYS(KC_K, KC_L, KC_D) { SEND_STRING("kubectl logs deployment/"); }
-        SEQ_TWO_KEYS(KC_K, KC_V) { SEND_STRING("kubectl version "); }
-        SEQ_TWO_KEYS(KC_K, KC_I) { SEND_STRING("kubectl exec -it "); }
-        SEQ_TWO_KEYS(KC_K, KC_E) { SEND_STRING("kubectl edit "); }
-        SEQ_THREE_KEYS(KC_K, KC_E, KC_D) { SEND_STRING("kubectl edit deployment/"); }
-        SEQ_TWO_KEYS(KC_K, KC_D) { SEND_STRING("kubectl describe "); }
-        SEQ_TWO_KEYS(KC_K, KC_N) { SEND_STRING("kubens "); }
-        SEQ_TWO_KEYS(KC_K, KC_C) { SEND_STRING("kubectx "); }
 
         // Git
         SEQ_TWO_KEYS(KC_G, KC_P) { SEND_STRING("git push"); }
@@ -92,8 +48,6 @@ void matrix_scan_user(void) {
 
         // emacs
         SEQ_TWO_KEYS(KC_E, KC_X) { SEND_STRING(SS_LALT(SS_TAP(X_X))); }
-        SEQ_TWO_KEYS(KC_E, KC_B) { SEND_STRING(SS_TAP(X_SPACE) SS_TAP(X_B) SS_TAP(X_B)); }
-        SEQ_TWO_KEYS(KC_E, KC_F) { SEND_STRING(SS_TAP(X_SPACE) SS_TAP(X_F) SS_TAP(X_F)); }
 
         // copypastas
         SEQ_THREE_KEYS(KC_P, KC_N, KC_B) {
@@ -106,19 +60,17 @@ void matrix_scan_user(void) {
         // systemctl
         SEQ_TWO_KEYS(KC_S, KC_R) { SEND_STRING("systemctl restart "); }
         SEQ_THREE_KEYS(KC_S, KC_U, KC_R) { SEND_STRING("systemctl --user restart "); }
-        SEQ_TWO_KEYS(KC_S, KC_E) { SEND_STRING("systemctl enable "); }
-        SEQ_THREE_KEYS(KC_S, KC_U, KC_E) { SEND_STRING("systemctl --user enable "); }
-        SEQ_TWO_KEYS(KC_S, KC_D) { SEND_STRING("systemctl disable "); }
-        SEQ_THREE_KEYS(KC_S, KC_U, KC_D) { SEND_STRING("systemctl --user disable "); }
         SEQ_TWO_KEYS(KC_S, KC_S) { SEND_STRING("systemctl stop "); }
         SEQ_THREE_KEYS(KC_S, KC_U, KC_S) { SEND_STRING("systemctl --user stop "); }
         SEQ_TWO_KEYS(KC_S, KC_K) { SEND_STRING("systemctl kill "); }
         SEQ_THREE_KEYS(KC_S, KC_U, KC_K) { SEND_STRING("systemctl --user kill "); }
 
         // Mara stickers
-        SEQ_TWO_KEYS(KC_M, KC_H) { SEND_STRING("https://cdn.christine.website/file/christine-static/stickers/mara/hacker.png\n"); }
+        SEQ_TWO_KEYS(KC_M, KC_H) { send_sticker("mara/hacker"); }
-        SEQ_TWO_KEYS(KC_M, KC_W) { SEND_STRING("https://cdn.christine.website/file/christine-static/stickers/mara/wat.png\n"); }
+        SEQ_TWO_KEYS(KC_M, KC_W) { send_sticker("mara/wat"); }
-        SEQ_TWO_KEYS(KC_M, KC_T) { SEND_STRING("https://cdn.christine.website/file/christine-static/stickers/mara/hmm.png\n"); }
+        SEQ_TWO_KEYS(KC_M, KC_T) { send_sticker("mara/hmm"); }
-        SEQ_TWO_KEYS(KC_M, KC_S) { SEND_STRING("https://cdn.christine.website/file/christine-static/stickers/mara/sh0rck.png\n"); }
+        SEQ_TWO_KEYS(KC_M, KC_S) { send_sticker("mara/sh0rck"); }
+        SEQ_TWO_KEYS(KC_M, KC_A) { send_sticker("mara/aha"); }
+        SEQ_TWO_KEYS(KC_M, KC_P) { send_sticker("mara/happy"); }
     }
 }

moonlander/rules.mk

@@ -8,8 +8,9 @@ SRC = matrix.c
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
 WPM_ENABLE = yes
-STENO_ENABLE = yes
+STENO_ENABLE = no
 LEADER_ENABLE = yes
 USER_NAME := kadis
 COMBO_ENABLE = yes
+RAW_ENABLE = yes
 VPATH += keyboards/gboards/