colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove legacy XKB config

Browse Source
This commit is contained in:
Ivan Malison
2026-02-04 16:12:10 -08:00
committed by Kat Huang
parent bc6f713de9
commit d9f5415660
14 changed files with 1 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dotfiles/config/xmonad/xmonad.hs
View File

@@ -1034,8 +1034,6 @@ addKeys conf@XConfig { modMask = modm } =
, ((hyper, xK_space), spawn "skippy-xd")
, ((hyper, xK_i), spawn "rofi_select_input.hs")
, ((hyper, xK_o), spawn "rofi_paswitch")
, ((modm, xK_apostrophe), spawn "load_default_map")
, ((modalt, xK_apostrophe), spawn "load_xkb_map")
, ((modm, xK_e), spawn "emacsclient --eval '(emacs-everywhere)'")
-- Media keys

12
dotfiles/lib/functions/load_default_map
View File

@@ -1,12 +0,0 @@
#!/usr/bin/env sh
function load_default_map {
XKBDIR="$HOME/.xkb"
XKBMAPFILE="$XKBDIR/keymap/default"
echo "loading keymap from $XKBMAPFILE"
xkbcomp -I"$XKBDIR" "$XKBMAPFILE" "${DISPLAY%%.*}"
}
load_default_map

24
dotfiles/lib/functions/load_xkb_map
View File

@@ -1,24 +0,0 @@
#!/usr/bin/env sh
function load_xkb_map {
XKBDIR="$HOME/.xkb"
XKBMAPFILE="$XKBDIR/keymap/$(hostname --fqdn)"
[[ -r "$XKBMAPFILE" ]] || XKBMAPFILE="${XKBMAPFILE%/*}/default"
echo "loading keymap from $XKBMAPFILE"
xkbcomp -I"$XKBDIR" "$XKBMAPFILE" "${DISPLAY%%.*}"
XKB_DEVICE_DIR="$XKBDIR/devices"
for file in "$XKB_DEVICE_DIR"/*
do
DEVICE_ID=$(xinput | grep "$(basename $file)" | head -n 1 | grep -Eo "id=[0-9]*" | grep -Eo "[0-9]*")
echo $file
echo device
echo "$DEVICE_ID"
# [ ! -z "$DEVICE_ID" ] && xkbcomp -I"$XKBDIR" -i "$DEVICE_ID" "$file" "${DISPLAY%%.*}"
done
}
load_xkb_map

7
dotfiles/xkb/keymap/adell
View File

@@ -1,7 +0,0 @@
xkb_keymap {
xkb_keycodes { include "evdev+aliases(qwerty)" };
xkb_types { include "complete" };
xkb_compat { include "complete" };
xkb_symbols { include "pc+us+inet(evdev)+altwin(swap_lalt_lwin)+imalison(ralt_as_hyper)+capslock(ctrl_modifier)" };
xkb_geometry { include "pc(pc105)" };
};

7
dotfiles/xkb/keymap/default
View File

@@ -1,7 +0,0 @@
xkb_keymap {
xkb_keycodes { include "evdev+aliases(qwerty)" };
xkb_types { include "complete" };
xkb_compat { include "complete" };
xkb_symbols { include "pc+us+inet(evdev)+imalison(rwin_as_hyper)+imalison(home_as_hyper)+capslock(ctrl_modifier)" };
xkb_geometry { include "pc(pc105)" };
};

7
dotfiles/xkb/keymap/ivanm-dfinity-razer
View File

@@ -1,7 +0,0 @@
xkb_keymap {
xkb_keycodes { include "evdev+aliases(qwerty)" };
xkb_types { include "complete" };
xkb_compat { include "complete" };
xkb_symbols { include "pc+us+inet(evdev)+altwin(swap_lalt_lwin)+imalison(ralt_as_hyper)+imalison(ins_as_dot)+imalison(del_as_slash)+capslock(ctrl_modifier)" };
xkb_geometry { include "pc(pc105)" };
};

7
dotfiles/xkb/keymap/jay-lenovo
View File

@@ -1,7 +0,0 @@
xkb_keymap {
xkb_keycodes { include "evdev+aliases(qwerty)" };
xkb_types { include "complete" };
xkb_compat { include "complete" };
xkb_symbols { include "pc+us+inet(evdev)+altwin(swap_lalt_lwin)+imalison(ralt_as_hyper)+capslock(ctrl_modifier)" };
xkb_geometry { include "pc(pc105)" };
};

7
dotfiles/xkb/keymap/katboon
View File

@@ -1,7 +0,0 @@
xkb_keymap {
xkb_keycodes { include "evdev+aliases(qwerty)" };
xkb_types { include "complete" };
xkb_compat { include "complete" };
xkb_symbols { include "pc+us+inet(evdev)+altwin(swap_lalt_lwin)+imalison(ralt_as_hyper)+capslock(ctrl_modifier)" };
xkb_geometry { include "pc(pc105)" };
};

7
dotfiles/xkb/keymap/stevie-nixos
View File

@@ -1,7 +0,0 @@
xkb_keymap {
xkb_keycodes { include "evdev+aliases(qwerty)" };
xkb_types { include "complete" };
xkb_compat { include "complete" };
xkb_symbols { include "pc+us+inet(evdev)+altwin(swap_lalt_lwin)+imalison(ralt_as_hyper)+capslock(ctrl_modifier)" };
xkb_geometry { include "pc(pc105)" };
};

7
dotfiles/xkb/keymap/strixi-minaj
View File

@@ -1,7 +0,0 @@
xkb_keymap {
xkb_keycodes { include "evdev+aliases(qwerty)" };
xkb_types { include "complete" };
xkb_compat { include "complete" };
xkb_symbols { include "pc+us+inet(evdev)+altwin(swap_lalt_lwin)+imalison(ralt_as_hyper)+capslock(ctrl_modifier)" };
xkb_geometry { include "pc(pc105)" };
};

5
dotfiles/xkb/symbols/hyper
View File

@@ -1,5 +0,0 @@
partial modifier_keys
xkb_symbols "rwin" {
key <RWIN> { [ Hyper_R ] };
modifier_map Mod3 { <HYPR>, Hyper_R };
};

27
dotfiles/xkb/symbols/imalison
View File

@@ -1,27 +0,0 @@
partial modifier_keys
xkb_symbols "rwin_as_hyper" {
replace key <RWIN> { [ Hyper_L ] };
modifier_map Mod3 { <RWIN>, Hyper_L, Hyper_R };
};
partial modifier_keys
xkb_symbols "home_as_hyper" {
replace key <HOME> { [ Hyper_L ] };
modifier_map Mod3 { <HOME>, Hyper_L, Hyper_R };
};
partial modifier_keys
xkb_symbols "ralt_as_hyper" {
replace key <RALT> { [ Hyper_L, Hyper_L ] };
modifier_map Mod3 { <RALT>, Hyper_L };
};
partial alphanumeric_keys
xkb_symbols "ins_as_dot" {
replace key <INS> { [ period, greater ] };
};
partial alphanumeric_keys
xkb_symbols "del_as_slash" {
replace key <DELE> { [ slash, question ] };
};

4
nixos/desktop.nix
View File

@@ -10,9 +10,6 @@ makeEnable config "myModules.desktop" true {
services.xserver = {
exportConfiguration = true;
enable = true;
xkb = {
layout = "us";
};
displayManager = {
sessionCommands = ''
systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
@@ -53,7 +50,6 @@ makeEnable config "myModules.desktop" true {
xclip
xdotool
xorg.xev
xorg.xkbcomp
xorg.xwininfo
xsettingsd

2
rcm-link.sh
View File

@@ -4,4 +4,4 @@ export THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export DOTFILES_DIR="$(readlink -f $THIS_DIR/dotfiles)"
echo $DOTFILES_DIR
rcup -d $DOTFILES_DIR -S "emacs.d" -S "config/*" -S "lib" -S xkb
rcup -d $DOTFILES_DIR -S "emacs.d" -S "config/*" -S "lib"