From c81060660cd61fbd0532d58c1df0f2f985e10122 Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Sat, 26 Oct 2024 17:02:38 +0100
Subject: [PATCH 1/2] Make vimdiff the default Git mergetool

---
 git/.gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index 4391554..8612cf6 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,3 +3,5 @@
 [user]
 	name = The Magician
 	email = themagician@engineer.com
+[merge]
+	tool = vimdiff

From a3ab9081079e9222fe9e06517760eb8dcd5e9c58 Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Sat, 26 Oct 2024 17:07:37 +0100
Subject: [PATCH 2/2] Set keyboard layout properly for PC

---
 X/.xinitrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/X/.xinitrc b/X/.xinitrc
index 4da8c0c..ffd898e 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -3,8 +3,8 @@
 # Set desktop background
 command -v feh &1>/dev/null && feh --bg-scale $HOME/pix/wallpaper.jpg &
 
-# Swap CAPSLOCK and Escape
-setxkbmap -option caps:swapescape gb &
+# Set keyboard map
+setxkbmap -option caps:swapescape 40percent &
 
 # Run compositor
 picom --daemon