From c62920b569b73289632c6c91e3ebc58a80dbfece Mon Sep 17 00:00:00 2001
From: pancakes <trypancakes@tutanota.com>
Date: Mon, 1 Apr 2024 17:44:31 +1000
Subject: [PATCH] I finally bought a new cable for my second monitor after a
 year

---
 kanshi/.config/kanshi/config | 32 ++++++++++++++++++++++++++++++--
 river/.config/river/init     | 22 ++++++++++++++++++----
 waybar/.config/waybar/config |  2 ++
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/kanshi/.config/kanshi/config b/kanshi/.config/kanshi/config
index 3d00f60..1a6fc62 100644
--- a/kanshi/.config/kanshi/config
+++ b/kanshi/.config/kanshi/config
@@ -1,7 +1,35 @@
 profile amida {
-    output "AOC 27G2G4 GYGL9HA232568" mode 1920x1080@144Hz adaptive_sync on
+    output "AOC 27G2G4 GYGL9HA232568" {
+        adaptive_sync on
+        mode 1920x1080@144Hz
+    }
+    
+    exec swww img ~/.wallpaper
+}
+
+profile amida2 {
+    output "AOC 27G2G4 GYGL9HA232568" {
+        adaptive_sync on
+        mode 1920x1080@144Hz
+        position 720,50
+        scale 1.0
+    }
+
+    output "AOC 2470W GGJH9HA056165" {
+        adaptive_sync off
+        mode 1920x1080@60Hz
+        position 0,0
+        scale 1.5
+        transform 90
+    }
+
+    exec swww img ~/.wallpaper
 }
 
 profile vlam {
-    output eDP-1 scale 1.5
+    output eDP-1 {
+        scale 1.5
+    }
+    
+    exec swww img ~/.wallpaper
 }
diff --git a/river/.config/river/init b/river/.config/river/init
index 4868811..87e221b 100755
--- a/river/.config/river/init
+++ b/river/.config/river/init
@@ -17,23 +17,39 @@ riverctl spawn "udiskie -t -f '$TERMINAL -e ranger'" # Removeable storage manage
 riverctl spawn "wl-paste --type text --watch cliphist store" # Stores only text data
 riverctl spawn "wl-paste --type image --watch cliphist store" # Stores only image data
 riverctl spawn waybar # Bar
-riverctl spawn "sleep 1s && swww init && swww img ~/.wallpaper" # Wallpaper daemon
+riverctl spawn swww-daemon # Wallpaper daemon
 
 # Per device apps
 while read program; do
-    riverctl spawn $program
+    riverctl spawn "$program"
 done < ~/.config/autostart
 
+## Behaviour
+riverctl default-attach-mode below
+
 # Window rules
 riverctl rule-add ssd # Use server side decorations for everything (surely this will not break shit)
 riverctl rule-add -app-id blueberry.py float # Float Blueberry
+riverctl rule-add -app-id Element tags 16 # Move Element to tag 5
 riverctl rule-add -app-id pavucontrol float # Float pavucontrol
 riverctl rule-add -app-id steam -title "Friends List" float # Float Steam Friends
+riverctl rule-add -app-id steam tags 32 # Move Steam to tag 6
+riverctl rule-add -app-id vesktop tags 8 # Move Vesktop to tag 4
 riverctl rule-add -app-id "waydroid*" fullscreen # Fullscreen all Waydroid applications
 riverctl rule-add -app-id windowkill csd
 riverctl rule-add -app-id windowkill float
 riverctl rule-add -app-id windowkill position 0 0
 
+# If on amida and second monitor connected
+if [ "$HOSTNAME" = "amida" ] && wlr-randr | grep -q "Model: 2470W"; then
+    riverctl rule-add -app-id Element output "AOC 2470W GGJH9HA056165" # Move Element to second monitor
+    riverctl rule-add -app-id Element tags 2 # Move Element to tag 2
+    riverctl rule-add -app-id steam output "AOC 2470W GGJH9HA056165" # Move Steam to second monitor
+    riverctl rule-add -app-id steam tags 4 # Move Steam to tag 3
+    riverctl rule-add -app-id vesktop output "AOC 2470W GGJH9HA056165" # Move Vesktop to second monitor
+    riverctl rule-add -app-id vesktop tags 1 # Move Vesktop to tag 1
+fi
+
 ## Appearance
 riverctl xcursor-theme Adwaita 24
 
@@ -73,8 +89,6 @@ riverctl map normal Super E spawn "$TERMINAL -e ranger"
 riverctl map normal Super+Shift E spawn thunar
 riverctl map normal Control+Shift Escape spawn "$TERMINAL -e btop"
 
-echo $(realpath .) >> ~/test.txt
-
 # Screenshots
 mkdir -p ~/Pictures/Screenshots # Make screenshots folder if missing
 riverctl map normal None Print spawn "~/config/screenshot.sh ~/Pictures/Screenshots full true"
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index 37639b9..9b60d1b 100644
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -1,4 +1,6 @@
 {
+    "layer": "top",
+    "output": "!HDMI-A-1",
     "spacing": 4,
     "modules-left": [
         "river/tags",