Remove legacy XKB config

dotfiles/config/xmonad/xmonad.hs

@@ -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

dotfiles/lib/functions/load_default_map

@@ -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

dotfiles/lib/functions/load_xkb_map

@@ -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

dotfiles/xkb/keymap/adell

@@ -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)"	};
-};

dotfiles/xkb/keymap/default

@@ -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)"	};
-};

dotfiles/xkb/keymap/ivanm-dfinity-razer

@@ -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)"	};
-};

dotfiles/xkb/keymap/jay-lenovo

@@ -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)"	};
-};

dotfiles/xkb/keymap/katboon

@@ -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)"	};
-};

dotfiles/xkb/keymap/stevie-nixos

@@ -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)"	};
-};

dotfiles/xkb/keymap/strixi-minaj

@@ -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)"	};
-};

dotfiles/xkb/symbols/hyper

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

dotfiles/xkb/symbols/imalison

@@ -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 ] };
-};

nixos/desktop.nix

@@ -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
 

rcm-link.sh

@@ -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"