Merge branch 'main' of git.themagician.cc:TheMagician/stow

Set keyboard layout properly for PC
Make vimdiff the default Git mergetool
2024-10-26 17:08:05 +01:00 · 2024-10-26 17:07:37 +01:00 · 2024-10-26 17:02:38 +01:00
1 changed files with 2 additions and 2 deletions
--- a/X/.xinitrc
+++ b/X/.xinitrc
@ -3,8 +3,8 @@
 # Set desktop background
 command -v feh &1>/dev/null && feh --bg-max $HOME/pix/wallpaper.png &
-# Swap CAPSLOCK and Escape
+# Set keyboard map
-setxkbmap -option caps:swapescape gb &
+setxkbmap -option caps:swapescape 40percent &
 # Run compositor
 picom --daemon
Author	SHA1	Message	Date
The Magician	e606ca0436	Merge branch 'main' of git.themagician.cc:TheMagician/stow	2024-10-26 17:08:05 +01:00
The Magician	a3ab908107	Set keyboard layout properly for PC	2024-10-26 17:07:37 +01:00
The Magician	c81060660c	Make vimdiff the default Git mergetool	2024-10-26 17:02:38 +01:00