From cac0bbfcd2584d1cdbaf7b0a4f3cc992ca9ccffa Mon Sep 17 00:00:00 2001
From: tslil clingman <>
Date: Thu, 11 Jun 2020 11:55:30 -0400
Subject: Merge bison changes

---
 .xinitrc | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/.xinitrc b/.xinitrc
index cfebbd8..9132eb0 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,17 +1,33 @@
-setxkbmap -layout us -variant workman -option
-setxkbmap -option terminate:ctrl_alt_bksp,ctrl:swap_lwin_lctl,caps:ctrl_modifier
+# If Atreus is plugged in, don't change keyboard layouts
+if [ -n "$(lsusb | grep 1209:a1e5)" ]; then
+    setxkbmap -option terminate:ctrl_alt_bksp -option ctrl:nocaps
+else
+    setxkbmap -model pc105curl -layout us -variant cmk_ed_dh -option terminate:ctrl_alt_bksp -option ctrl:nocaps
+fi
 
+# No screen off
 xset s off
 xset -dpms
-#xset m 5/1 4
 
+# Themeing
 xrdb -merge ~/.Xdefaults
-
 xsetroot -cursor_name left_ptr
 
-# Unfortunately redshift doesn't work
-# redshift -l +39:-76 -t 5500:4900 &
+# Fix screen tearing
+#picom --config ~/.config/picom.conf &
+
+# Physical screen management
+[[ -f "$HOME/.umonitor.lock" ]] && rm $HOME/.umonitor.lock
+umonitor --listen --quiet &
+
+# Automatic colour temperature adjustment for Baltimore
+redshift -l +39:-76 &
+
+# Battery status icon in tray
+cbatticon -u 30 -i symbolic &
 
-#compton --config ~/.config/compton.conf &
+# Network Manager in tray
+nm-applet &
 
+# The only thing i really need
 exec emacs
-- 
cgit v1.2.3