updates
This commit is contained in:
parent
4cd1ac558f
commit
1fe1faea2a
13 changed files with 82 additions and 51 deletions
|
@ -1 +1 @@
|
|||
Subproject commit 30f503cef37be5d3f46624aca120c7a859a520f3
|
||||
Subproject commit 376fa3bf0d9d14d8a1b4303875f43fee95cd3399
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
export EDITOR="nvim"
|
||||
export TERMINAL="st"
|
||||
export BROWSER="firefox"
|
||||
export BROWSER="brave-browser"
|
||||
|
||||
# Settings
|
||||
export VIRTUAL_ENV_DISABLE_PROMPT=1
|
||||
|
|
|
@ -1,13 +1,16 @@
|
|||
#!/bin/sh
|
||||
default="${DEFAULT_XKBMAPFILE:-dvorak.xkb}"
|
||||
|
||||
default="${XDG_DATA_HOME}/xkb/compiled/default"
|
||||
statefile="/tmp/current-keymap"
|
||||
compiled_dir="${XDG_DATA_HOME}/xkb/compiled/"
|
||||
default_file="${compiled_dir}${default}"
|
||||
|
||||
[ -r $statefile ] && current=$(cat $statefile) || current=""
|
||||
|
||||
setmap() {
|
||||
if [ ! -r "$1" ]; then
|
||||
notify-send -h string:x-dunst-stack-tag:"remaps" " Failed to set keymap" "Could not find $1"
|
||||
return 1
|
||||
fi
|
||||
|
||||
xkbcomp "$1" "$DISPLAY"
|
||||
if $notify; then
|
||||
notify-send -h string:x-dunst-stack-tag:"remaps" \
|
||||
|
@ -22,7 +25,7 @@ setmap() {
|
|||
|
||||
rotatemap() {
|
||||
if [ "$current" = "" ]; then
|
||||
setmap "$default_file"
|
||||
setmap "$default"
|
||||
return
|
||||
fi
|
||||
currentfound=false
|
||||
|
@ -42,13 +45,17 @@ rotatemap() {
|
|||
}
|
||||
|
||||
notify=true
|
||||
while getopts dq flag; do
|
||||
while getopts dqQ flag; do
|
||||
case "$flag" in
|
||||
q) notify=false ;;
|
||||
Q)
|
||||
notify=false
|
||||
error_notify=false
|
||||
;;
|
||||
d)
|
||||
setmap "$default_file"
|
||||
setmap "$default"
|
||||
return
|
||||
;;
|
||||
q) notify=false ;;
|
||||
*) ;;
|
||||
esac
|
||||
done
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=File Manager
|
||||
Exec=kitty -e lfcd %u
|
||||
Exec=st -e lfcd %u
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=Text editor
|
||||
Exec=kitty -e nvim %u
|
||||
Exec=st -e nvim %u
|
||||
|
|
1
.local/share/xkb/compiled/default
Symbolic link
1
.local/share/xkb/compiled/default
Symbolic link
|
@ -0,0 +1 @@
|
|||
ergodox.xkb
|
|
@ -1184,7 +1184,7 @@ xkb_compatibility "complete" {
|
|||
};
|
||||
};
|
||||
|
||||
xkb_symbols "pc+custom(dvorak)+inet(evdev)+level3(ralt_switch)+capslock(super)" {
|
||||
xkb_symbols "pc+custom(dvorak)+inet(evdev)+capslock(super)" {
|
||||
|
||||
name[group1]="English (Dvorak, Custom)";
|
||||
|
||||
|
|
|
@ -1184,9 +1184,9 @@ xkb_compatibility "complete" {
|
|||
};
|
||||
};
|
||||
|
||||
xkb_symbols "pc+us(basic)+inet(evdev)+compose(menu)" {
|
||||
xkb_symbols "pc+custom(us)+inet(evdev)" {
|
||||
|
||||
name[group1]="English (US)";
|
||||
name[group1]="English (US, Custom)";
|
||||
|
||||
key <ESC> {
|
||||
// type= "ONE_LEVEL",
|
||||
|
@ -1197,12 +1197,12 @@ xkb_symbols "pc+us(basic)+inet(evdev)+compose(menu)" {
|
|||
symbols[Group1]= [ 1, exclam ]
|
||||
};
|
||||
key <AE02> {
|
||||
// type= "TWO_LEVEL",
|
||||
symbols[Group1]= [ 2, at ]
|
||||
type= "FOUR_LEVEL",
|
||||
symbols[Group1]= [ 2, at, twosuperior, NoSymbol ]
|
||||
};
|
||||
key <AE03> {
|
||||
// type= "TWO_LEVEL",
|
||||
symbols[Group1]= [ 3, numbersign ]
|
||||
type= "FOUR_LEVEL",
|
||||
symbols[Group1]= [ 3, numbersign, threesuperior, section ]
|
||||
};
|
||||
key <AE04> {
|
||||
// type= "TWO_LEVEL",
|
||||
|
@ -1273,16 +1273,16 @@ xkb_symbols "pc+us(basic)+inet(evdev)+compose(menu)" {
|
|||
symbols[Group1]= [ y, Y ]
|
||||
};
|
||||
key <AD07> {
|
||||
type= "ALPHABETIC",
|
||||
symbols[Group1]= [ u, U ]
|
||||
type= "FOUR_LEVEL_ALPHABETIC",
|
||||
symbols[Group1]= [ u, U, udiaeresis, Udiaeresis ]
|
||||
};
|
||||
key <AD08> {
|
||||
type= "ALPHABETIC",
|
||||
symbols[Group1]= [ i, I ]
|
||||
};
|
||||
key <AD09> {
|
||||
type= "ALPHABETIC",
|
||||
symbols[Group1]= [ o, O ]
|
||||
type= "FOUR_LEVEL_ALPHABETIC",
|
||||
symbols[Group1]= [ o, O, odiaeresis, Odiaeresis ]
|
||||
};
|
||||
key <AD10> {
|
||||
type= "ALPHABETIC",
|
||||
|
@ -1305,12 +1305,12 @@ xkb_symbols "pc+us(basic)+inet(evdev)+compose(menu)" {
|
|||
symbols[Group1]= [ Control_L ]
|
||||
};
|
||||
key <AC01> {
|
||||
type= "ALPHABETIC",
|
||||
symbols[Group1]= [ a, A ]
|
||||
type= "FOUR_LEVEL_ALPHABETIC",
|
||||
symbols[Group1]= [ a, A, adiaeresis, Adiaeresis ]
|
||||
};
|
||||
key <AC02> {
|
||||
type= "ALPHABETIC",
|
||||
symbols[Group1]= [ s, S ]
|
||||
type= "FOUR_LEVEL_ALPHABETIC",
|
||||
symbols[Group1]= [ s, S, ssharp, U1E9E ]
|
||||
};
|
||||
key <AC03> {
|
||||
type= "ALPHABETIC",
|
||||
|
@ -1349,16 +1349,16 @@ xkb_symbols "pc+us(basic)+inet(evdev)+compose(menu)" {
|
|||
symbols[Group1]= [ apostrophe, quotedbl ]
|
||||
};
|
||||
key <TLDE> {
|
||||
// type= "TWO_LEVEL",
|
||||
symbols[Group1]= [ grave, asciitilde ]
|
||||
type= "FOUR_LEVEL",
|
||||
symbols[Group1]= [ grave, asciitilde, degree, NoSymbol ]
|
||||
};
|
||||
key <LFSH> {
|
||||
// type= "ONE_LEVEL",
|
||||
symbols[Group1]= [ Shift_L ]
|
||||
};
|
||||
key <BKSL> {
|
||||
// type= "TWO_LEVEL",
|
||||
symbols[Group1]= [ backslash, bar ]
|
||||
type= "FOUR_LEVEL",
|
||||
symbols[Group1]= [ backslash, bar, notsign, brokenbar ]
|
||||
};
|
||||
key <AB01> {
|
||||
type= "ALPHABETIC",
|
||||
|
@ -1385,16 +1385,16 @@ xkb_symbols "pc+us(basic)+inet(evdev)+compose(menu)" {
|
|||
symbols[Group1]= [ n, N ]
|
||||
};
|
||||
key <AB07> {
|
||||
type= "ALPHABETIC",
|
||||
symbols[Group1]= [ m, M ]
|
||||
type= "FOUR_LEVEL_SEMIALPHABETIC",
|
||||
symbols[Group1]= [ m, M, mu, NoSymbol ]
|
||||
};
|
||||
key <AB08> {
|
||||
// type= "TWO_LEVEL",
|
||||
symbols[Group1]= [ comma, less ]
|
||||
};
|
||||
key <AB09> {
|
||||
// type= "TWO_LEVEL",
|
||||
symbols[Group1]= [ period, greater ]
|
||||
type= "FOUR_LEVEL",
|
||||
symbols[Group1]= [ period, greater, EuroSign, NoSymbol ]
|
||||
};
|
||||
key <AB10> {
|
||||
// type= "TWO_LEVEL",
|
||||
|
@ -1573,8 +1573,8 @@ xkb_symbols "pc+us(basic)+inet(evdev)+compose(menu)" {
|
|||
symbols[Group1]= [ Print, Sys_Req ]
|
||||
};
|
||||
key <RALT> {
|
||||
// type= "TWO_LEVEL",
|
||||
symbols[Group1]= [ Alt_R, Meta_R ]
|
||||
type= "ONE_LEVEL",
|
||||
symbols[Group1]= [ ISO_Level3_Shift ]
|
||||
};
|
||||
key <LNFD> {
|
||||
// type= "ONE_LEVEL",
|
||||
|
@ -1673,8 +1673,8 @@ xkb_symbols "pc+us(basic)+inet(evdev)+compose(menu)" {
|
|||
symbols[Group1]= [ Super_R ]
|
||||
};
|
||||
key <COMP> {
|
||||
type= "TWO_LEVEL",
|
||||
symbols[Group1]= [ Multi_key, Multi_key ]
|
||||
// type= "ONE_LEVEL",
|
||||
symbols[Group1]= [ Menu ]
|
||||
};
|
||||
key <STOP> {
|
||||
// type= "ONE_LEVEL",
|
||||
|
@ -2112,7 +2112,6 @@ xkb_symbols "pc+us(basic)+inet(evdev)+compose(menu)" {
|
|||
modifier_map Mod2 { <NMLK> };
|
||||
modifier_map Mod5 { <LVL3> };
|
||||
modifier_map Control { <RCTL> };
|
||||
modifier_map Mod1 { <RALT> };
|
||||
modifier_map Mod4 { <LWIN> };
|
||||
modifier_map Mod4 { <RWIN> };
|
||||
modifier_map Mod3 { <LVL5> };
|
||||
|
|
|
@ -2,6 +2,6 @@ default xkb_keymap {
|
|||
xkb_keycodes { include "evdev+aliases(qwerty)" };
|
||||
xkb_types { include "complete" };
|
||||
xkb_compat { include "complete" };
|
||||
xkb_symbols { include "pc+custom(dvorak)+inet(evdev)+level3(ralt_switch)+capslock(super)" };
|
||||
xkb_symbols { include "pc+custom(dvorak)+inet(evdev)+capslock(super)" };
|
||||
xkb_geometry { include "pc(pc105)" };
|
||||
};
|
||||
|
|
|
@ -2,6 +2,6 @@ default xkb_keymap {
|
|||
xkb_keycodes { include "evdev+aliases(qwerty)" };
|
||||
xkb_types { include "complete" };
|
||||
xkb_compat { include "complete" };
|
||||
xkb_symbols { include "pc+us(basic)+inet(evdev)+compose(menu)" };
|
||||
xkb_symbols { include "pc+custom(us)+inet(evdev)" };
|
||||
xkb_geometry { include "pc(pc105)" };
|
||||
};
|
||||
|
|
|
@ -1,15 +1,39 @@
|
|||
partial alphanumeric_keys
|
||||
|
||||
xkb_symbols "dvorak" {
|
||||
include "us(dvorak)"
|
||||
name[Group1] = "English (Dvorak, Custom)";
|
||||
|
||||
key <TLDE> { [grave, asciitilde, degree ] };
|
||||
key <AE04> { [4, dollar, EuroSign ] };
|
||||
key <TLDE> { [grave, asciitilde, degree ] };
|
||||
key <AE04> { [4, dollar, EuroSign ] };
|
||||
|
||||
key <AC01> { [a, A, adiaeresis, Adiaeresis ] };
|
||||
key <AC02> { [o, O, odiaeresis, Odiaeresis ] };
|
||||
key <AC04> { [u, U, udiaeresis, Udiaeresis ] };
|
||||
key <AC10> { [s, S, ssharp ] };
|
||||
|
||||
key <BKSL> { [ backslash, bar, notsign, brokenbar ] };
|
||||
|
||||
key <AC01> { [a, A, adiaeresis, Adiaeresis ] };
|
||||
key <AC02> { [o, O, odiaeresis, Odiaeresis ] };
|
||||
key <AC04> { [u, U, udiaeresis, Udiaeresis ] };
|
||||
key <AC10> { [s, S, ssharp ] };
|
||||
|
||||
key <BKSL> { [ backslash, bar, notsign, brokenbar ] };
|
||||
include "level3(ralt_switch)"
|
||||
};
|
||||
|
||||
// This layout is meant for my ergodox keyboard, which remaps in firmware
|
||||
xkb_symbols "us" {
|
||||
include "us(basic)"
|
||||
name[Group1] = "English (US, Custom)";
|
||||
|
||||
key <TLDE> { [grave, asciitilde, degree ] };
|
||||
|
||||
key <AE02> { [2, at, twosuperior ] };
|
||||
key <AE03> { [3, numbersign, threesuperior, section ] };
|
||||
key <AB07> { [m, M, mu ] };
|
||||
key <AB09> { [period, greater, EuroSign ] };
|
||||
key <AC01> { [a, A, adiaeresis, Adiaeresis ] };
|
||||
key <AC02> { [s, S, ssharp, U1E9E ] };
|
||||
key <AD07> { [u, U, udiaeresis, Udiaeresis ] };
|
||||
key <AD09> { [o, O, odiaeresis, Odiaeresis ] };
|
||||
|
||||
key <BKSL> { [ backslash, bar, notsign, brokenbar ] };
|
||||
|
||||
include "level3(ralt_switch)"
|
||||
};
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 90ea84521579aa62819aaaf3584bc0d75af942a7
|
||||
Subproject commit 17b6f68ab4a701ee4a8b01596fd4e810ceea2e61
|
|
@ -1 +1 @@
|
|||
Subproject commit 9e33da9ac753a799a555739a7bb138f588364d57
|
||||
Subproject commit c1c84d6fa5479b82266f2f6a140e61991e509b60
|
Loading…
Add table
Reference in a new issue