Update .chezmoidata.toml

Update README.md Update .config/hypr/monitors.conf Update .config/kanshi/config Update .config/waybar/config Update hyprland.zsh
AndreasBackx · Sep 6, 2023 · 7383d4b · 7383d4b
1 parent 2ff99db
commit 7383d4b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 44 deletions.
diff --git a/.chezmoidata.toml b/.chezmoidata.toml
@@ -18,12 +18,18 @@ mode = "2560x1440@60Hz"
 position = "5101x227"
 scale = "1"
 
+[monitors.work.laptop]
+name = "LG Display 0x0662"
+mode = "1920x1080@60Hz"
+position = "3181x1905"
+scale = "1"
+
 [monitors.home]
 [monitors.home.left]
 name = "Dell Inc. DELL U2515H 9X2VY4B101CL"
 mode = "3840x2160@60Hz"
 position = "0x30"
-scale = "1.3"
+scale = "1"
 
 [monitors.home.center]
 name = "Acer Technologies XF270HU T78EE0048521"
@@ -43,7 +49,7 @@ mode = "3840x2160@120Hz"
 position = "6560x0"
 scale = "1.5"
 
-[monitors.laptop]
+[monitors.home.laptop]
 name = "LG Display 0x0662"
 mode = "1920x1080@60Hz"
 position = "3181x1905"

diff --git a/README.md b/README.md
@@ -8,29 +8,7 @@ This repository contains most if not all of the changes made to my machines that
 ```toml
 [data]
 [data.monitors]
-[data.monitors.left]
-name = "Dell Inc. DELL U3219Q F2XWXV2"
-mode = "3840x2160@60Hz"
-position = "0x0"
-scale = "1.3"
-
-[data.monitors.center]
-name = "Acer Technologies XV340CK P T5Y000013E00"
-mode = "3440x1440@144Hz"
-position = "1661x465"
-scale = "1"
-
-[data.monitors.right]
-name = "Dell Inc. DELL U2515H 9X2VY6A80A8L"
-mode = "2560x1440@144Hz"
-position = "5101x227"
-scale = "1"
-
-[data.monitors.laptop]
-name = "LG Display 0x0662"
-mode = "1920x1080@60Hz"
-position = "3181x1905"
-scale = "1"
+selected = "home"
 
 [edit]
     command = "code"

diff --git a/private_dot_config/hypr/monitors.conf.tmpl b/private_dot_config/hypr/monitors.conf.tmpl
@@ -1,11 +1,10 @@
 # See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=,preferred,auto,auto
 
-monitor=desc:{{ .monitors.left.name }}, {{ .monitors.left.mode }}, {{ .monitors.left.position }}, {{ .monitors.left.scale }}, transform, 1
-monitor=desc:{{ .monitors.center.name }}, {{ .monitors.center.mode }}, {{ .monitors.center.position }}, {{ .monitors.center.scale }}
-monitor=desc:{{ .monitors.right.name }}, {{ .monitors.right.mode }}, {{ .monitors.right.position }}, {{ .monitors.right.scale }}, transform, 3
+monitor=desc:{{ index .monitors .monitors.selected "left" "name" }}, {{ index .monitors .monitors.selected "left" "mode" }}, {{ index .monitors .monitors.selected "left" "position" }}, {{ index .monitors .monitors.selected "left" "scale" }}, transform, 1
+monitor=desc:{{ index .monitors .monitors.selected "center" "name" }}, {{ index .monitors .monitors.selected "center" "mode" }}, {{ index .monitors .monitors.selected "center" "position" }}, {{ index .monitors .monitors.selected "center" "scale" }}
+monitor=desc:{{ index .monitors .monitors.selected "right" "name" }}, {{ index .monitors .monitors.selected "right" "mode" }}, {{ index .monitors .monitors.selected "right" "position" }}, {{ index .monitors .monitors.selected "right" "scale" }}, transform, 3
 
-exec = swaybg --output "$MONITOR_LEFT" --image ~/.config/wallpapers/dark/1440x2560/jon-snow.jpg --mode fill
-exec = swaybg --output "$MONITOR_CENTER" --image ~/.config/wallpapers/dark/2560x1440/jaime-lannister.jpg --mode fill
-exec = swaybg --output "$MONITOR_RIGHT" --image ~/.config/wallpapers/dark/1440x2560/tyrion-lannister.jpg --mode fill
+exec = swaybg --output {{ index .monitors .monitors.selected "left" "name" }} --image ~/.config/wallpapers/dark/1440x2560/jon-snow.jpg --mode fill
+exec = swaybg --output {{ index .monitors .monitors.selected "center" "name" }} --image ~/.config/wallpapers/dark/2560x1440/jaime-lannister.jpg --mode fill
+exec = swaybg --output {{ index .monitors .monitors.selected "right" "name" }} --image ~/.config/wallpapers/dark/1440x2560/tyrion-lannister.jpg --mode fill
 
diff --git a/private_dot_config/kanshi/config.tmpl b/private_dot_config/kanshi/config.tmpl
@@ -1,5 +1,3 @@
-# this file is autogenerated by ~/.bin/sway-config
-
 profile "Home" {
     output "{{ .monitors.home.left.name }}" position {{ .monitors.home.left.position | replace "x" "," }} transform 90
     output "{{ .monitors.home.center.name }}" position {{ .monitors.home.center.position | replace "x" "," }}
@@ -19,7 +17,7 @@ profile "Office Work Laptop Open" {
     output "{{ .monitors.work.center.name }}" position {{ .monitors.work.center.position | replace "x" "," }}
     output "{{ .monitors.work.right.name }}" position {{ .monitors.work.right.position | replace "x" "," }} transform 270
 
-    output "{{ .monitors.laptop.name }}" position {{ .monitors.laptop.position | replace "x" "," }} enable
+    output "{{ .monitors.work.laptop.name }}" position {{ .monitors.work.laptop.position | replace "x" "," }} enable
 }
 
 profile "Office Work Laptop Closed" {
@@ -29,14 +27,14 @@ profile "Office Work Laptop Closed" {
 }
 
 # profile "Work Laptop Only" {
-#     output "{{ .monitors.laptop.name }}" enable
+#     output "{{ .monitors.work.laptop.name }}" enable
 # }
 
 # profile "Bjarne Laptop Open" {
 #     output "Goldstar Company Ltd LG HDR 4K 0x00004E72" position 0,470 scale 1.5
 #     output "Dell Inc. DELL U2715H GH85D74E134S" position 2560,0 transform 270
 
-#     output "{{ .monitors.laptop.name }}" enable position 320,1910
+#     output "{{ .monitors.work.laptop.name }}" enable position 320,1910
 # }
 
 # profile "Bjarne Laptop Closed" {

diff --git a/private_dot_config/waybar/config.tmpl b/private_dot_config/waybar/config.tmpl
@@ -135,7 +135,7 @@
             "clock",
             "tray"
         ],
-        "output": ["{{ .monitors.center.name }}"],
+        "output": ["{{ index .monitors .monitors.selected "center" "name" }}"],
         "position": "bottom",
         "pulseaudio": {
             "format": "<span color=\"#6E6E6E\">{icon}</span>  {volume}%",
@@ -306,7 +306,7 @@
             "clock",
             "tray"
         ],
-        "output": ["{{ .monitors.laptop.name }}"],
+        "output": ["{{ index .monitors .monitors.selected "laptop" "name" }}"],
         "position": "bottom",
         "pulseaudio": {
             "format": "<span color=\"#6E6E6E\">{icon}</span>  {volume}%",
@@ -374,7 +374,7 @@
             "hyprland/window"
         ],
         "modules-right": ["custom/brightness", "clock"],
-        "output": ["{{ .monitors.left.name }}"],
+        "output": ["{{ index .monitors .monitors.selected "left" "name" }}"],
         "position": "bottom"
     },
     {
@@ -434,7 +434,7 @@
             "hyprland/window"
         ],
         "modules-right": ["custom/brightness", "clock"],
-        "output": ["{{ .monitors.right.name }}"],
+        "output": ["{{ index .monitors .monitors.selected "right" "name" }}"],
         "position": "bottom"
     }
 ]
diff --git a/run_after_hyprland.zsh b/run_after_hyprland.zsh
@@ -1,5 +1,4 @@
 #!/usr/bin/env zsh
 
-if [ ! -f /usr/share/wayland-sessions/hyprland-shell.desktop ]; then
-  sudo cp ~/.config/hypr/hyprland-shell.desktop /usr/share/wayland-sessions/hyprland-shell.desktop
-fi
+sudo cp ~/.config/hypr/hyprland-shell.desktop /usr/share/wayland-sessions/hyprland-shell.desktop
+