Merge remote-tracking branch 'refs/remotes/github/master'

This commit is contained in:
js0ny 2025-03-13 10:31:35 +00:00
commit c48e024289
5 changed files with 65 additions and 22 deletions

1
.gitattributes vendored
View file

@ -7,7 +7,6 @@
# Windows Batch Script, keep CRLF
*.bat text eol=crlf
skhdrc linguist-language=Shell
yabairc linguist-language=Shell
sketchybarrc linguist-language=Shell
*.vimrc linguist-language=VimL

View file

@ -1066,6 +1066,38 @@
"vendor_id": 5426
},
"ignore": false
},
{
"identifiers": {
"is_keyboard": true,
"is_pointing_device": true,
"product_id": 560,
"vendor_id": 13364
},
"ignore": false,
"simple_modifications": [
{
"from": { "key_code": "backslash" },
"to": [{ "key_code": "delete_or_backspace" }]
},
{
"from": { "key_code": "delete_or_backspace" },
"to": [{ "key_code": "backslash" }]
},
{
"from": { "key_code": "left_command" },
"to": [{ "key_code": "left_option" }]
},
{
"from": { "key_code": "left_control" },
"to": [{ "key_code": "left_command" }]
},
{
"from": { "key_code": "left_option" },
"to": [{ "apple_vendor_top_case_key_code": "keyboard_fn" }]
}
],
"treat_as_built_in_keyboard": true
}
],
"name": "Colemak",

View file

@ -134,7 +134,6 @@ window_rules:
match:
# Ignores any Zebar windows.
- window_process: { equals: "zebar" }
- window_process: { equals: "WindowsTerminal" }
# Ignores picture-in-picture windows for browsers.
- window_title: { regex: "[Pp]icture.in.[Pp]icture" }
@ -147,6 +146,15 @@ window_rules:
window_title: { regex: ".*? - Peek" }
- window_process: { equals: "Lively" }
window_class: { regex: "HwndWrapper" }
- window_process: { equals: "WindowsTerminal" }
- commands: ["set-floating"]
match:
# Razer Synapse
- window_process: { equals: "RazerAppEngine" }
# AutoHotKey Window Spy
- window_process: { equals: "AutoHotkeyUX" }
- window_process: { equals: "ApplicationFrameHost" }
window_title: { regex: "Settings|设置" }
binding_modes:
# When enabled, the focused window can be resized via arrow keys or HJKL.
@ -186,14 +194,14 @@ keybindings:
bindings: ["lwin+shift+n", "lwin+shift+down"]
# Resize focused window by a percentage or pixel amount.
- commands: ["resize --width -2%"]
bindings: ["alt+u"]
- commands: ["resize --width +2%"]
bindings: ["alt+p"]
- commands: ["resize --height +2%"]
bindings: ["alt+o"]
- commands: ["resize --height -2%"]
bindings: ["alt+i"]
# - commands: ["resize --width -2%"]
# bindings: ["alt+u"]
# - commands: ["resize --width +2%"]
# bindings: ["alt+p"]
# - commands: ["resize --height +2%"]
# bindings: ["alt+o"]
# - commands: ["resize --height -2%"]
# bindings: ["alt+i"]
# As an alternative to the resize keybindings above, resize mode enables
# resizing via arrow keys or HJKL. The binding mode is defined above with
@ -217,7 +225,7 @@ keybindings:
# Change the focused window to be floating.
- commands: ["toggle-floating --centered"]
bindings: ["alt+shift+space"]
bindings: ["lwin+shift+space"]
# Change the focused window to be tiling.
- commands: ["toggle-tiling"]
@ -287,14 +295,14 @@ keybindings:
# Move the focused window's parent workspace to a monitor in a given
# direction.
- commands: ["move-workspace --direction left"]
bindings: ["alt+shift+a"]
- commands: ["move-workspace --direction right"]
bindings: ["alt+shift+f"]
- commands: ["move-workspace --direction up"]
bindings: ["alt+shift+d"]
- commands: ["move-workspace --direction down"]
bindings: ["alt+shift+s"]
# - commands: ["move-workspace --direction left"]
# bindings: ["alt+shift+a"]
# - commands: ["move-workspace --direction right"]
# bindings: ["alt+shift+f"]
# - commands: ["move-workspace --direction up"]
# bindings: ["alt+shift+d"]
# - commands: ["move-workspace --direction down"]
# bindings: ["alt+shift+s"]
# Move focused window to a workspace defined in `workspaces` config.
- commands: ["move --workspace 1", "focus --workspace 1"]

View file

@ -131,7 +131,7 @@
)
(if (not (eq system-type 'windows-nt))
(if (eq system-type 'gnu/linux)
(use-package! rime
:config
(setq default-input-method "rime")

View file

@ -10,6 +10,10 @@ move_visual_mark_down n
screen_down N
screen_up E
## Zoom
zoom_in =
### Search
next_item k