lots of fixes, improvements, t12 stuff

[distro-setup] / laptop-xrandr

diff --git a/laptop-xrandr b/laptop-xrandr
index 28c840e4eadff86b60d8de4b19542e1050ce1992..6701e74525d7c2203a4a03a5fc9c533596b04ec9 100755 (executable)
--- a/laptop-xrandr
+++ b/laptop-xrandr
@@ -22,25 +22,32 @@
 
 set -e; . /usr/local/lib/bash-bear; set +e
 
-
-output=$(xrandr | grep -E "^(HDMI.?|DP1) connected" | awk '{print $1}' ||:)
+# eg eDP-1 connected primary
+laptop_out=$(xrandr | awk '$3 == "primary" {print $1}')
+output=$(xrandr | grep -E "^(HDMI|DP)[^ ]* connected [0-9]" | awk '{print $1}' ||:)
 
 left_right_arg=--right-of
 if [[ $output ]]; then
 
-  if [[ $output == HDMI2 ]]; then
-    sum=$(sha256sum </sys/class/drm/card0-HDMI-A-2/edid | grep -oE '^.{10}')
-    # identify monitor that is always on the left.
-    if [[ $sum == 192efbdcef ]]; then
-      left_right_arg=--left-of
-    fi
+  # identify monitors that are always on the left.
+  if [[ $output == HDMI2 && $(sha256sum </sys/class/drm/card0-HDMI-A-2/edid | grep -oE '^.{10}') == 192efbdcef ]]; then
+    left_right_arg=--left-of
+  fi
+  if [[ $output == HDMI-1 && $(sha256sum </sys/class/drm/card1-HDMI-A-1/edid | grep -oE '^.{10}') == 7c58f9ac1e ]]; then
+    left_right_arg=--left-of
   fi
+
   xrandr --output $output --off
   sleep 2
-  xrandr --output $output $left_right_arg eDP1 --mode 3840x2160
+  mode=$(xrandr | grep -A1 -E "^$output" | tail -n1 | awk '{print $1}')
+  # eg: 3840x2160
+  echo mode=$mode
+  xrandr --output $output $left_right_arg $laptop_out --mode $mode
 
   for i in 1 2 4 5 6 7 8 9 10; do
-    # if the workspace is already there, this will fail
+    # if the workspace is already there, this will fail.
+    # if the workspace doesn't exist yet, it fails with:
+    # ERROR: No output matched
     i3-msg '[workspace="'$i'"]' move workspace to output $output ||:
   done
 else