Merge branch 'master' of ssh://dundun.ddns.net:222/sheldonmlee/dotfiles

This commit is contained in:
Sheldon Lee 2022-09-07 18:24:08 +08:00
commit eb2999cd7d
2 changed files with 6 additions and 2 deletions

View File

@ -17,7 +17,7 @@ export _JAVA_AWT_WM_NONREPARENTING=1
if [[ -z "$DISPLAY" ]] && [[ $(tty) = /dev/tty1 ]]; then if [[ -z "$DISPLAY" ]] && [[ $(tty) = /dev/tty1 ]]; then
if [[ ! -z "$IS_LAPTOP" ]]; then if [[ ! -z "$IS_LAPTOP" ]]; then
exec startx exec dbus-run-session sway
else else
exec start-sway.sh exec start-sway.sh
fi fi

View File

@ -99,7 +99,11 @@ exec swayidle -w \
xkb_layout us xkb_layout us
xkb_variant colemak xkb_variant colemak
} }
input 1:1:AT_Translated_Set_2_keyboard {
xkb_layout "us"
xkb_variant "colemak"
xkb_options "caps:ctrl_modifier,altwin:swap_alt_win"
}
# You can get the names of your inputs by running: swaymsg -t get_inputs # You can get the names of your inputs by running: swaymsg -t get_inputs
# Read `man 5 sway-input` for more information about this section. # Read `man 5 sway-input` for more information about this section.