From 046fec6bad273aba98bfdbd5fa99f1814ccc959d Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Tue, 30 Jan 2024 15:03:52 -0500 Subject: [PATCH] Tweak various things --- configs/helix/config.toml | 13 +++ .../Multiplayer_mc.ewpratten.com/config.txt | 15 ++++ .../dim%0/mw$default_1.txt | 7 ++ .../Multiplayer_mc.sdf.org/config.txt | 3 + configs/nvim/init.vim | 13 +++ configs/vim/.vimrc | 5 ++ keyboards/qmk/keymaps/ferris/keymap.c | 87 +++++++++++-------- keyboards/qmk/keymaps/tg4x/config.h | 19 ++++ keyboards/qmk/keymaps/tg4x/rules.mk | 5 +- scripts/qmk-helper | 2 +- 10 files changed, 132 insertions(+), 37 deletions(-) create mode 100644 configs/helix/config.toml create mode 100644 configs/minecraft/XaeroWaypoints/Multiplayer_mc.ewpratten.com/config.txt create mode 100644 configs/minecraft/XaeroWaypoints/Multiplayer_mc.ewpratten.com/dim%0/mw$default_1.txt diff --git a/configs/helix/config.toml b/configs/helix/config.toml new file mode 100644 index 0000000..0f3ee7c --- /dev/null +++ b/configs/helix/config.toml @@ -0,0 +1,13 @@ +[editor] +mouse = true +middle-click-paste = true +line-number = "absolute" +auto-completion = true +auto-format = false + +[editor.cursor-shape] +normal = "block" +insert = "bar" +select = "block" + + diff --git a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.ewpratten.com/config.txt b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.ewpratten.com/config.txt new file mode 100644 index 0000000..86e49c9 --- /dev/null +++ b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.ewpratten.com/config.txt @@ -0,0 +1,15 @@ +//waypoints config options +usingMultiworldDetection:false +ignoreServerLevelId:false +defaultMultiworldId:mw0,0,0 +teleportationEnabled:true +usingDefaultTeleportCommand:true +sortType:NONE +sortReversed:false + +//other config options +ignoreHeightmaps:false + +//dimension types (DO NOT EDIT) +dimensionType:minecraft$the_nether:minecraft$the_nether +dimensionType:minecraft$overworld:minecraft$overworld diff --git a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.ewpratten.com/dim%0/mw$default_1.txt b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.ewpratten.com/dim%0/mw$default_1.txt new file mode 100644 index 0000000..b0f95fd --- /dev/null +++ b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.ewpratten.com/dim%0/mw$default_1.txt @@ -0,0 +1,7 @@ +# +#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:visibility_type:destination +# +waypoint:Sand:S:1152:66:-1542:3:false:0:gui.xaero_default:false:0:0:false +waypoint:Base:B:1138:82:-1028:4:false:0:gui.xaero_default:false:0:0:false +waypoint:Temp mountain base:T:678:80:-274:5:false:0:gui.xaero_default:false:0:0:false +waypoint:Spawn:S:0:64:0:10:false:0:gui.xaero_default:false:0:0:false diff --git a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.sdf.org/config.txt b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.sdf.org/config.txt index bc89407..725713a 100644 --- a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.sdf.org/config.txt +++ b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.sdf.org/config.txt @@ -11,3 +11,6 @@ sortReversed:false //other config options ignoreHeightmaps:false + +//dimension types (DO NOT EDIT) +dimensionType:minecraft$overworld:minecraft$overworld diff --git a/configs/nvim/init.vim b/configs/nvim/init.vim index 8347f88..cab8e5d 100644 --- a/configs/nvim/init.vim +++ b/configs/nvim/init.vim @@ -30,6 +30,15 @@ endif " Enable Leap lua require('leap').add_default_mappings() +" Enable Helix-style command suggestions +"lua require('command-completion').setup() + +" Enable trailing space detection +lua require('mini.trailspace').setup() + +" Configure floating window colours +highlight Pmenu ctermbg=none ctermfg=white + " VSCode-style comment toggling nnoremap :Commentary vnoremap :Commentary @@ -42,3 +51,7 @@ function! MkdirAndWrite() exec 'w' endfunction command Wmk call MkdirAndWrite() + +" LSP Support +"lua require "lspconfig".rust_analyzer.setup {} +"lua vim.keymap.set('n', 'e', vim.diagnostic.open_float) diff --git a/configs/vim/.vimrc b/configs/vim/.vimrc index 73ea498..d411eae 100644 --- a/configs/vim/.vimrc +++ b/configs/vim/.vimrc @@ -46,6 +46,11 @@ set shortmess+=I cnoreabbrev help getcmdtype() == ":" && getcmdline() == 'help' ? 'tab help' : 'help' cnoreabbrev h getcmdtype() == ":" && getcmdline() == 'h' ? 'tab help' : 'h' +" Configure netrw +let g:netrw_liststyle = 3 +let g:netrw_banner = 0 +let g:netrw_browse_split = 3 + " Enable spell checking if !exists('g:vscode') set spell diff --git a/keyboards/qmk/keymaps/ferris/keymap.c b/keyboards/qmk/keymaps/ferris/keymap.c index 3db33d0..28768f6 100644 --- a/keyboards/qmk/keymaps/ferris/keymap.c +++ b/keyboards/qmk/keymaps/ferris/keymap.c @@ -5,11 +5,13 @@ // Layer definitions enum ferris_layers { + // _HOME, + // _QWERTY, _MODMAK, - _NUMERIC, - _UTILITY, - _MACROS, - _RAINBOW, + // _NUMERIC, + // _UTILITY, + // _MACROS, + // _RAINBOW, }; // Shorthands @@ -21,40 +23,55 @@ enum ferris_layers { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // [_HOME] = LAYOUT( + // KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSPC, + // KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, + // KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + // KC_LSFT, KC_LCTL, KC_SPACE, KC_NO + // ), + + // [_QWERTY] = LAYOUT( + // KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + // KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + // KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_NO, + // KC_LCTL, KC_SPACE, KC_SPACE, KC_LSFT + // ) + [_MODMAK] = LAYOUT( KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_M, KC_K, KC_COMM, KC_DOT, - KC_LSFT, MO(_MACROS), LT(_UTILITY, KC_SPACE), LT(_NUMERIC, KC_SPACE) + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_M, KC_K, KC_COMM, KC_DOT, + KC_LSFT, KC_LCTL, KC_SPACE, KC_SPACE + // KC_LSFT, MO(_MACROS), LT(_UTILITY, KC_SPACE), LT(_NUMERIC, KC_SPACE) ), - [_NUMERIC] = LAYOUT( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, /**/ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - KC_1, KC_2, KC_3, KC_4, KC_5, /**/ KC_6, KC_7, KC_8, KC_9, KC_0, - KC_LALT, KC_NO, KC_NO, KC_NO, TO(_MODMAK), /**/ KC_LGUI, KC_EQL, KC_MINS, KC_F11, KC_F12, - KC_LSFT, KC_LCTL, /**/ KC_NO, KC_NO - ), + // [_NUMERIC] = LAYOUT( + // KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, /**/ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + // KC_1, KC_2, KC_3, KC_4, KC_5, /**/ KC_6, KC_7, KC_8, KC_9, KC_0, + // KC_LALT, KC_NO, KC_NO, KC_NO, TO(_MODMAK), /**/ KC_LGUI, KC_EQL, KC_MINS, KC_F11, KC_F12, + // KC_LSFT, KC_LCTL, /**/ KC_NO, KC_NO + // ), - [_UTILITY] = LAYOUT( - KC_Q, KC_VOLD, KC_VOLU, KC_NO, KC_PSCR, /**/ LD_TERM, KC_HOME, KC_PGUP, KC_PGDN, KC_DEL, - KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_TAB, /**/ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_END, - KC_NO, KC_NO, KC_NO, CC_FMT, CC_COMM, /**/ KC_QUOTE, KC_SLSH, KC_LBRC, KC_RBRC, KC_BSLS, - KC_LSFT, KC_LCTL, /**/ KC_NO, KC_LGUI - ), + // [_UTILITY] = LAYOUT( + // KC_Q, KC_VOLD, KC_VOLU, KC_NO, KC_PSCR, /**/ LD_TERM, KC_HOME, KC_PGUP, KC_PGDN, KC_DEL, + // KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_TAB, /**/ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_END, + // KC_NO, KC_NO, KC_NO, CC_FMT, CC_COMM, /**/ KC_QUOTE, KC_SLSH, KC_LBRC, KC_RBRC, KC_BSLS, + // KC_LSFT, KC_LCTL, /**/ KC_NO, KC_LGUI + // ), - [_MACROS] = LAYOUT( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_RAINBOW), - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO - ), + // [_MACROS] = LAYOUT( + // KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_RAINBOW), + // KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + // KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + // KC_NO, KC_NO, KC_NO, KC_NO + // ), - [_RAINBOW] = LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_5, TO(_MODMAK), KC_NO, KC_NO, KC_NO, KC_NO, - KC_LSFT, KC_A, KC_S, KC_D, KC_G, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_SPACE, KC_X, KC_NO, KC_NO - ) + // [_RAINBOW] = LAYOUT( + // KC_ESC, KC_Q, KC_W, KC_E, KC_5, TO(_MODMAK), KC_NO, KC_NO, KC_NO, KC_NO, + // KC_LSFT, KC_A, KC_S, KC_D, KC_G, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + // KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + // KC_SPACE, KC_X, KC_NO, KC_NO + // ) }; // clang-format on @@ -71,11 +88,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { // Space cadet needs to be much slower than my default - case SC_LSPO: - case SC_LCPO: - return 200; - case LT(_NUMERIC, KC_SPACE): - return 1000; + // case SC_LSPO: + // case SC_LCPO: + // return 200; + // case LT(_NUMERIC, KC_SPACE): + // return 1000; default: return TAPPING_TERM; } diff --git a/keyboards/qmk/keymaps/tg4x/config.h b/keyboards/qmk/keymaps/tg4x/config.h index 1b8737d..7540ffc 100644 --- a/keyboards/qmk/keymaps/tg4x/config.h +++ b/keyboards/qmk/keymaps/tg4x/config.h @@ -5,3 +5,22 @@ // Use Linux unicode mode #define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX + +// Custom USB HID info +// #undef VENDOR_ID +// #undef PRODUCT_ID +// #undef DEVICE_VER +// #undef MANUFACTURER +// #undef PRODUCT +// #define VENDOR_ID 0x6570 // "ep" +// #define PRODUCT_ID 0x0458 // 4 "X" +// #define DEVICE_VER 0x0021 +// #define MANUFACTURER ewpratten +// #define PRODUCT tg4x + +// Lighting settings +#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT +#define RGBLIGHT_DEFAULT_HUE 0 +#define RGBLIGHT_DEFAULT_SAT 255 +#define RGBLIGHT_DEFAULT_VAL 255 +#define RGBLIGHT_DEFAULT_ON true diff --git a/keyboards/qmk/keymaps/tg4x/rules.mk b/keyboards/qmk/keymaps/tg4x/rules.mk index a7c99e9..08d85df 100644 --- a/keyboards/qmk/keymaps/tg4x/rules.mk +++ b/keyboards/qmk/keymaps/tg4x/rules.mk @@ -6,4 +6,7 @@ BOOTMAGIC_ENABLE = yes # Enable Unicode UNICODE_COMMON = yes -UNICODE_ENABLE = yes \ No newline at end of file +UNICODE_ENABLE = yes + +# Enable RGB lighting +RGBLIGHT_ENABLE = yes diff --git a/scripts/qmk-helper b/scripts/qmk-helper index ec3821d..a3b6a47 100755 --- a/scripts/qmk-helper +++ b/scripts/qmk-helper @@ -152,7 +152,7 @@ def main() -> int: build_keymap(args.keyboard) elif args.mode == "flash": # Make sure that the flash mode is valid - if args.keyboard == "ferris-sweep" and args.flash_mode not in ["dfu-split-left", "dfu-split-right"]: + if args.keyboard == "ferris/sweep" and args.flash_mode not in ["dfu-split-left", "dfu-split-right"]: logger.error( "Invalid flash mode. Must be one of: dfu-split-left, dfu-split-right" )