diff --git a/flake.lock b/flake.lock index 26e2958..1863e90 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -38,11 +38,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -54,11 +54,11 @@ "keymap_drawer": { "flake": false, "locked": { - "lastModified": 1695143346, - "narHash": "sha256-iGfoG8PYkElARY51XXVQR53dwWIHhGuzld3lXsZu/Es=", + "lastModified": 1703374901, + "narHash": "sha256-wfm4W9vkhfezeVpB07hRWcljt8aJP79yxFVNgCw5RJw=", "owner": "caksoylar", "repo": "keymap-drawer", - "rev": "e5eaa5ab81db342b4ef93410e8fdf83e3a3a2ea7", + "rev": "e9efae1948c216a9e64d817d8289cbf7fe735a23", "type": "github" }, "original": { @@ -75,11 +75,11 @@ ] }, "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "lastModified": 1698974481, + "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "rev": "4bb5e752616262457bc7ca5882192a564c0472d2", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696009558, - "narHash": "sha256-/1nNL8lCF0gn38XaFyu2ufpWcBFwCDZyYUxdZkM6GxU=", + "lastModified": 1704008649, + "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c182df2e68bd97deb32c7e4765adfbbbcaf75b60", + "rev": "d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7", "type": "github" }, "original": { @@ -107,11 +107,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { @@ -128,14 +128,16 @@ "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems_2", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1695386222, - "narHash": "sha256-5lgnhCCGW0NH5+m5iTED8u6NSSM/dbH9LBPvX0x0XXg=", + "lastModified": 1703546497, + "narHash": "sha256-CN/7HaEmHz+akXKejkRVhsxAm6HPGOmYBWMtgMkuROA=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "093383b3d7fdd36846a7d84e128ca11865800538", + "rev": "528d500ea826383cc126a9be1e633fc92b19ce5d", "type": "github" }, "original": { @@ -147,10 +149,10 @@ "qmk_firmware": { "flake": false, "locked": { - "lastModified": 1693313966, - "narHash": "sha256-P++ZvZ+aZMXK+fnjqttWbbys3TXVNd4r/765YFwBDR4=", + "lastModified": 1703603759, + "narHash": "sha256-sHQj8n4fJxVAFJcajYVwOYWAaexOBA/cSKquGaGthYc=", "ref": "bkb-master", - "rev": "1a0b8d1de3b7e5cf665f26781bf661954b155e0f", + "rev": "aad1a32b1e239c92b5e5aa18b14607c36f21015e", "shallow": true, "submodules": true, "type": "git", @@ -172,7 +174,7 @@ "nixpkgs": "nixpkgs", "poetry2nix": "poetry2nix", "qmk_firmware": "qmk_firmware", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" } }, "systems": { @@ -190,18 +192,53 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699786194, + "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1695822946, - "narHash": "sha256-IQU3fYo0H+oGlqX5YrgZU3VRhbt2Oqe6KmslQKUO4II=", + "lastModified": 1702979157, + "narHash": "sha256-RnFBbLbpqtn4AoJGXKevQMCGhra4h6G2MPcuTSZZQ+g=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "720bd006d855b08e60664e4683ccddb7a9ff614a", + "rev": "2961375283668d867e64129c22af532de8e77734", "type": "github" }, "original": { diff --git a/qmk/yuanw/config.h b/qmk/yuanw/config.h index 68e75fa..74ff60f 100644 --- a/qmk/yuanw/config.h +++ b/qmk/yuanw/config.h @@ -27,7 +27,6 @@ #endif // __arm__ - /* Charybdis-specific features. */ #ifdef POINTING_DEVICE_ENABLE diff --git a/qmk/yuanw/keymap.c b/qmk/yuanw/keymap.c index 8bc2803..26797b7 100644 --- a/qmk/yuanw/keymap.c +++ b/qmk/yuanw/keymap.c @@ -24,6 +24,14 @@ #endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE #include "repeat.h" +enum my_keycodes { RDO = SAFE_RANGE, + PST, + CPY, + CUT, + UND, + REPEAT, + REV_REP }; + // Automatically enable sniping-mode on the pointer layer. #define CHARYBDIS_AUTO_SNIPING_ON_LAYER LAYER_POINTER @@ -96,7 +104,7 @@ enum my_keycodes {RDO = SAFE_RANGE, PST, CPY, CUT, UND, REPEAT, REV_REP,}; #define LAYOUT_LAYER_MEDIA \ XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, KC_V, KC_LBRC, KC_RBRC, KC_SLSH, \ KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, QK_CAPS_WORD_TOGGLE, KC_H, KC_J, KC_K, KC_L, \ - XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, QK_BOOT, KC_HOME, KC_PGDN, KC_PGUP, KC_END, \ + XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, QK_BOOT, KC_HOME, KC_PGDN, KC_PGUP, KC_END, \ _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_TAB /** \brief Mouse emulation and pointer functions. */ @@ -247,17 +255,17 @@ layer_state_t layer_state_set_user(layer_state_t state) { void rgb_matrix_update_pwm_buffers(void); #endif -void shutdown_user(void) { -#ifdef RGBLIGHT_ENABLE - rgblight_enable_noeeprom(); - rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - rgblight_setrgb(RGB_RED); -#endif // RGBLIGHT_ENABLE -#ifdef RGB_MATRIX_ENABLE - rgb_matrix_set_color_all(RGB_RED); - rgb_matrix_update_pwm_buffers(); -#endif // RGB_MATRIX_ENABLE -} +/* void shutdown_user(void) { */ +/* #ifdef RGBLIGHT_ENABLE */ +/* rgblight_enable_noeeprom(); */ +/* rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); */ +/* rgblight_setrgb(RGB_RED); */ +/* #endif // RGBLIGHT_ENABLE */ +/* #ifdef RGB_MATRIX_ENABLE */ +/* rgb_matrix_set_color_all(RGB_RED); */ +/* rgb_matrix_update_pwm_buffers(); */ +/* #endif // RGB_MATRIX_ENABLE */ +/* } */ // Thumb Combos /* #define EXTRA_SHORT_COMBOS */