aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2022-06-23 22:46:52 +1200
committerTom Ryder <tom@sanctum.geek.nz>2022-06-23 22:46:52 +1200
commit8c23582694eed17689dd2192305c895b961344bf (patch)
tree42d9e3704a54f29c7eb7c6be264131bb5153da3f
parentUse three dashes, no space for attribution m-dash (diff)
downloaddotfiles-8c23582694eed17689dd2192305c895b961344bf.tar.gz
dotfiles-8c23582694eed17689dd2192305c895b961344bf.zip
Move Caps-Ctrl modifier into .keyboard file
This particular option works on the console, at least on Debian. May as well track it, and avoid setting it in the system-wide config.
-rw-r--r--Makefile1
-rw-r--r--x/keyboard10
-rw-r--r--x/xsession.sh6
3 files changed, 13 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index aa4d8ed1..e0f4b5f2 100644
--- a/Makefile
+++ b/Makefile
@@ -669,6 +669,7 @@ install-x: x/xsession check-xsession install-logrotate
cp -p -- x/xsession $(HOME)/.xsession
cp -p -- x/Xresources $(HOME)/.Xresources
cp -p -- x/Xresources.d/* $(HOME)/.Xresources.d
+ cp -p -- x/keyboard $(HOME)/.keyboard
cp -p -- x/logrotate/config.d/* $(XDG_CONFIG_HOME)/logrotate/config.d
install-yt-dlp install-youtube-dl:
diff --git a/x/keyboard b/x/keyboard
new file mode 100644
index 00000000..385f3530
--- /dev/null
+++ b/x/keyboard
@@ -0,0 +1,10 @@
+# Import the system keyboard settings...
+. /etc/default/keyboard
+
+# ...but then make Caps Lock act as Control, just for us. I feel like
+# caps:ctrl_modifier is a better option name to describe the intent here, and
+# it works fine in X, but not on the console.
+#
+XKBOPTIONS=ctrl:nocaps
+
+# We set X-specific options in ~/.xsession.
diff --git a/x/xsession.sh b/x/xsession.sh
index c0b5cb1c..805d8ef1 100644
--- a/x/xsession.sh
+++ b/x/xsession.sh
@@ -20,14 +20,12 @@ xargs xrandr \
xargs xwallpaper \
< "${XDG_CONFIG_HOME:-"$HOME"/.config}"/xwallpaper/config &
-# Set a few keyboard map options:
+# Add a couple more options to any set in ~/.keyboard:
#
-# - Remap Caps Lock as another Control key.
-# - Remap right Alt as a Compose key.
+# - Remap right Alt as an X Compose key.
# - Kill X server with Ctrl+Alt+Backspace.
#
setxkbmap \
- -option caps:ctrl_modifier \
-option compose:ralt \
-option terminate:ctrl_alt_bksp \
&