From bf49b2b447e43be3854e6361014318430ef2ad7f Mon Sep 17 00:00:00 2001
From: Patrick Spek
Date: Tue, 6 Oct 2020 10:10:23 +0200
Subject: Change how layout.sh is called
---
.local/bin/x | 6 ------
.local/etc/x/xinitrc | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to '.local')
diff --git a/.local/bin/x b/.local/bin/x
index 653cfb0..ed5e26f 100755
--- a/.local/bin/x
+++ b/.local/bin/x
@@ -15,12 +15,6 @@ then
# Remove the old config
rm -f -- "$HOME/.xinitrc"
- # Add layout script, if one exists
- if [ -f "$HOME/.local/etc/x/layout.sh" ]
- then
- cat "$HOME/.local/etc/x/layout.sh" >> "$HOME/.xinitrc"
- fi
-
# Add the base configuration
cat -- "$HOME/.local/etc/x/xinitrc" "$HOME/.local/etc/x/xinit.d/$1.rc" \
>> "$HOME/.xinitrc"
diff --git a/.local/etc/x/xinitrc b/.local/etc/x/xinitrc
index 107fb46..e006f3d 100644
--- a/.local/etc/x/xinitrc
+++ b/.local/etc/x/xinitrc
@@ -17,6 +17,12 @@ xsetroot -cursor_name left_ptr
# load the .Xresources
xrdb -merge ~/.Xresources
+# Set a custom layout with xrandr
+if [ -f "$HOME/.local/etc/x/layout.sh" ]
+then
+ /bin/sh "$HOME/.local/etc/x/layout.sh"
+fi
+
# xkbmap options
setxkbmap \
-layout us \
--
cgit v1.1