From 0a9ca8b889d78f1c711e1a4357a310c02f899023 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Mon, 14 Feb 2022 19:38:06 +0100
Subject: [PATCH] moar new computer

---
 .bin/notify.sh                     |  2 +-
 .bin/pulseaudio-assert-volume      |  2 +-
 .config/grobi.conf                 | 42 ++++++++++++++++++++++++++++++
 .config/grobi/grobi.conf           | 42 ------------------------------
 .config/i3/config                  | 10 +++----
 .config/systemd/user/grobi.service | 11 --------
 6 files changed, 49 insertions(+), 60 deletions(-)
 create mode 100644 .config/grobi.conf
 delete mode 100644 .config/grobi/grobi.conf
 delete mode 100644 .config/systemd/user/grobi.service

diff --git a/.bin/notify.sh b/.bin/notify.sh
index 3e2d48c..b1be7c2 100755
--- a/.bin/notify.sh
+++ b/.bin/notify.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-echo 'meowww?' | osd_cat --pos middle --align center --delay 9 -O 15 -f '-*-dejavu sans-*-*-*-*-120-200-*-*-*-*-*-*'
+notify-send --expire-time=9000 --app-name=i3lock "screen lock will activate shortly"
diff --git a/.bin/pulseaudio-assert-volume b/.bin/pulseaudio-assert-volume
index b8bdd6c..51a7671 100755
--- a/.bin/pulseaudio-assert-volume
+++ b/.bin/pulseaudio-assert-volume
@@ -30,7 +30,7 @@ try:
 
                 if line.startswith('volume:'):
                     for speaker, absolute, percent in findall('([a-z-]+):\W+([0-9]+)\W+\/\W+([0-9]+)%', line):
-                        if int(percent) < 100:
+                        if int(percent) > 3 and int(percent) < 100:
                             print(f'  sink {sink_id} speaker {speaker} at {percent} % volume', flush=True)
                             needs_adjusting = True
 
diff --git a/.config/grobi.conf b/.config/grobi.conf
new file mode 100644
index 0000000..a4a4d8f
--- /dev/null
+++ b/.config/grobi.conf
@@ -0,0 +1,42 @@
+# vim:ft=yaml
+
+execute_after:
+  - xset s 90 10
+  - /home/kunsi/.fehbg
+  - sudo rfkill unblock wifi
+#  - xrandr --output eDP --set "Broadcast RGB" "Full"
+
+on_failure:
+  - xrandr --auto
+
+rules:
+  - name: 'presentation'
+    outputs_connected:
+      - HDMI-A-0
+    configure_row:
+      - HDMI-A-0
+      - eDP
+    primary: eDP
+    execute_after:
+      - xset s off
+      - systemctl --user stop redshift.service
+
+  - name: 'docked'
+    outputs_connected:
+      - DisplayPort-3
+      - DisplayPort-4
+    configure_row:
+      - eDP
+      - DisplayPort-3
+      - DisplayPort-4
+    primary: DisplayPort-4
+    execute_after:
+      - xset s off
+      - sudo rfkill block wifi
+      - sudo light -S 100
+#      - xrandr --output DP2-2 --set "Broadcast RGB" "Full"
+#      - xrandr --output DP2-1 --set "Broadcast RGB" "Full"
+
+  - name: 'internal only'
+    configure_single: eDP
+    primary: eDP
diff --git a/.config/grobi/grobi.conf b/.config/grobi/grobi.conf
deleted file mode 100644
index a7c7fdf..0000000
--- a/.config/grobi/grobi.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-# vim:ft=yaml
-
-execute_after:
-  - xset s 90 10
-  - /home/kunsi/.fehbg
-  - sudo rfkill unblock wifi
-  - xrandr --output eDP1 --set "Broadcast RGB" "Full"
-
-on_failure:
-  - xrandr --auto
-
-rules:
-  - name: 'presentation'
-    outputs_connected:
-      - HDMI2
-    configure_row:
-      - HDMI2@1920x1080
-      - eDP1
-    primary: eDP1
-    execute_after:
-      - xset s off
-      - systemctl --user stop redshift.service
-
-  - name: 'docked with dock-connector'
-    outputs_connected:
-      - DP2-1
-      - DP2-2
-    configure_row:
-      - eDP1
-      - DP2-2
-      - DP2-1
-    primary: DP2-1
-    execute_after:
-      - xset s off
-      - sudo rfkill block wifi
-      - xbacklight =100
-      - xrandr --output DP2-2 --set "Broadcast RGB" "Full"
-      - xrandr --output DP2-1 --set "Broadcast RGB" "Full"
-
-  - name: 'internal only'
-    configure_single: eDP1
-    primary: eDP1
diff --git a/.config/i3/config b/.config/i3/config
index c9a6a5e..a9aa9ac 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -110,11 +110,11 @@ for_window [class="Gnome-calculator"] floating enable
 for_window [class="realvnc-vncviewer"] floating enable
 for_window [class="terminal-floating"] floating enable
 
-workspace $ws1 output DP2-2
-workspace $ws2 output DP2-1
-workspace $ws3 output DP2-2
-workspace $ws9 output eDP1
-workspace $ws10 output DP2-1
+workspace $ws1 output DisplayPort-3
+workspace $ws2 output DisplayPort-4
+workspace $ws3 output DisplayPort-3
+workspace $ws9 output eDP
+workspace $ws10 output DisplayPort-4
 
 exec_always setxkbmap -synch
 exec_always ~/.fehbg
diff --git a/.config/systemd/user/grobi.service b/.config/systemd/user/grobi.service
deleted file mode 100644
index f51829e..0000000
--- a/.config/systemd/user/grobi.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Automatically configure monitors/outputs for Xorg via RANDR
-
-[Service]
-ExecStart=/home/kunsi/git/grobi/grobi watch --verbose --config=/home/kunsi/.config/grobi/grobi.conf
-Restart=always
-RestartSec=10
-StartLimitInterval=0
-
-[Install]
-WantedBy=default.target