From 8ce2a3654c1fa977745f49012091e55b335723cc Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Tue, 21 Jul 2020 12:20:28 -0500
Subject: [PATCH] .xinitrc: Annotate, do monitor assignment, disable wpgen
---
.xinitrc | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/.xinitrc b/.xinitrc
index aacd6095..f7f46f7f 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,21 +1,32 @@
#!/bin/bash
+# Nest protection
if [ -n "$FIRESTARTER" ]; then
echo "Firestarter is already running in this session"
exit 50
fi
+# Find our terminal
for term in mate-terminal lxterminal xfce4-terminal konsole urxvt xterm; do
if command -v "$term" > /dev/null 2>&1; then
export TERMINAL="$term"
break
fi
done
-if [ -x "$HOME/.wpgen/wpgen" ]; then
- resolutions=($(xrandr -q | grep '*' | awk '{print $1}'))
- for res in ${resolutions[@]}; do
- "$HOME/.wpgen/wpgen" "$res"
- done
-fi
+# Monitor setup
+case $(hostname) in
+ dsk-cstm-0)
+ xrandr --output DisplayPort-1 --mode 2560x1440 --rate 144 --primary
+ xrandr --output HDMI-A-0 --mode 1920x1080 --rate 60 --pos 2560x360
+ ;;
+esac
+# Wallpaper generation because why not
+#if [ -x "$HOME/.wpgen/wpgen" ]; then
+# resolutions=($(xrandr -q | grep '*' | awk '{print $1}'))
+# for res in ${resolutions[@]}; do
+# "$HOME/.wpgen/wpgen" "$res"
+# done
+#fi
+# Session execution
if [ -x "$HOME/.config/conky/gen.sh" ]; then
"$HOME/.config/conky/gen.sh"
fi