4 files changed, 101 insertions, 87 deletions
diff --git a/stow/waybar/.config/waybar/config b/stow/waybar/.config/waybar/config
deleted file mode 100644
index f3dd9b1..0000000
--- a/stow/waybar/.config/waybar/config
+++ /dev/null
@@ -1,87 +0,0 @@
-[
-    {
-        "name": "topbar",
-        "layer": "bottom",
-        "position": "top",
-        "height": 0,
-        "modules-left": ["sway/workspaces", "sway/mode"],
-        "modules-center": ["sway/window"],
-        "modules-right": ["tray", "custom/reboot", "custom/backup", "pulseaudio", "battery", "temperature", "idle_inhibitor", "clock"],
-        "sway/workspaces": {
-            "format": "{name}<span font_scale='superscript' rise='6pt'> {index}</span>",
-            "format-icons": {
-                "1": "",
-                "2": "",
-                "3": ""
-            }
-        },
-        "sway/window": {
-          "max-length": 100,
-          "rewrite": {
-            "(.*) — Mozilla Firefox": "$1"
-          },
-          "icon": true,
-          "icon-size": 20
-        },
-        "tray": {
-            "spacing": 20
-        },
-        "clock": {
-            "interval": 1,
-            "format": "{:%a %d %b %I:%M %p}",
-            "format-alt": "{:%Y-%m-%d %H:%M:%S}",
-            "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-            "today-format": "<b>{}</b>"
-        },
-        "temperature": {
-            "critical-threshold": 80,
-            "format": "{icon}",
-            "format-alt": "{temperatureC}°C {icon}",
-            "format-icons": ["", "", ""],
-            "tooltip-format": "Temperature:  {temperatureC}°C"
-        },
-        "battery": {
-            "interval": 60,
-            "states": {
-              "warning": 30,
-              "critical": 15
-            },
-            "format": "{icon}",
-            "format-alt": "{capacity}% {icon}",
-            "format-charging": "\uf0e7",
-            "format-icons": ["", "", "", "", ""],
-            "tooltip-format": "Battery: {capacity}%\n{timeTo}"
-        },
-        "pulseaudio": {
-            "scroll-step": 5,
-            "format": "{icon}",
-            "format-muted": "",
-            "format-icons": {
-                "headphone": "",
-                "default": ["", ""]
-            },
-            "tooltip-format": "Volume:  {volume}%\n{desc}",
-            "on-click": "pavucontrol-qt"
-        },
-        "idle_inhibitor": {
-            "format": "{icon}",
-            "format-icons": {
-                "activated": "",
-                "deactivated": ""
-            },
-            "tooltip": false
-        },
-        "custom/reboot": {
-            "format": "{}",
-            "exec": "~/.local/bin/dnf-needs-restarting",
-            "return-type": "json",
-            "interval": 60
-        },
-        "custom/backup": {
-            "format": "{}",
-            "exec": "~/.local/bin/checkbackup",
-            "return-type": "json",
-            "interval": 60
-        }
-    }
-]
diff --git a/stow/waybar/.config/waybar/config-base b/stow/waybar/.config/waybar/config-base
new file mode 100644
index 0000000..4a3ba4b
--- /dev/null
+++ b/stow/waybar/.config/waybar/config-base
@@ -0,0 +1,85 @@
+{
+  "name": "topbar",
+  "layer": "bottom",
+  "position": "top",
+  "height": 0,
+  "modules-left": ["sway/workspaces", "sway/mode"],
+  "modules-center": ["sway/window"],
+  "sway/workspaces": {
+    "format": "{name}<span font_scale='superscript' rise='6pt'> {index}</span>",
+    "format-icons": {
+      "1": "",
+      "2": "",
+      "3": ""
+    }
+  },
+  "sway/window": {
+    "max-length": 100,
+    "rewrite": {
+      "(.*) — Mozilla Firefox": "$1"
+    },
+    "icon": true,
+    "icon-size": 20
+  },
+  "tray": {
+    "spacing": 20
+  },
+  "clock": {
+    "interval": 1,
+    "format": "{:%a %d %b %I:%M %p}",
+    "format-alt": "{:%Y-%m-%d %H:%M:%S}",
+    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+    "today-format": "<b>{}</b>"
+  },
+  "temperature#cpu": {
+    "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input",
+    "critical-threshold": 75,
+    "format": "{icon}",
+    "format-alt": "{temperatureC}°C {icon}",
+    "format-icons": ["", "", ""],
+    "tooltip-format": "Temperature:  {temperatureC}°C"
+  },
+  "battery": {
+    "interval": 60,
+    "states": {
+      "warning": 30,
+      "critical": 15
+    },
+    "format": "{icon}",
+    "format-alt": "{capacity}% {icon}",
+    "format-charging": "\uf0e7",
+    "format-icons": ["", "", "", "", ""],
+    "tooltip-format": "Battery: {capacity}%\n{timeTo}"
+  },
+  "pulseaudio": {
+    "scroll-step": 5,
+    "format": "{icon}",
+    "format-muted": "",
+    "format-icons": {
+      "headphone": "",
+      "default": ["", ""]
+    },
+    "tooltip-format": "Volume:  {volume}%\n{desc}",
+    "on-click": "pavucontrol-qt"
+  },
+  "idle_inhibitor": {
+    "format": "{icon}",
+    "format-icons": {
+      "activated": "",
+      "deactivated": ""
+    },
+    "tooltip": false
+  },
+  "custom/reboot": {
+    "format": "{}",
+    "exec": "~/.local/bin/dnf-needs-restarting",
+    "return-type": "json",
+    "interval": 60
+  },
+  "custom/backup": {
+    "format": "{}",
+    "exec": "~/.local/bin/checkbackup",
+    "return-type": "json",
+    "interval": 60
+  }
+}
diff --git a/stow/waybar/.config/waybar/config.1k b/stow/waybar/.config/waybar/config.1k
new file mode 100644
index 0000000..24bff8a
--- /dev/null
+++ b/stow/waybar/.config/waybar/config.1k
@@ -0,0 +1,4 @@
+{
+  "modules-right": ["tray", "custom/reboot", "custom/backup", "pulseaudio", battery, "temperature#cpu", "idle_inhibitor", "clock"],
+  "include": "~/.config/waybar/config-base",
+}
diff --git a/stow/waybar/.config/waybar/config.4k b/stow/waybar/.config/waybar/config.4k
new file mode 100644
index 0000000..f29d156
--- /dev/null
+++ b/stow/waybar/.config/waybar/config.4k
@@ -0,0 +1,12 @@
+{
+  "temperature#gpu": {
+    "hwmon-path": "/sys/class/hwmon/hwmon2/temp2_input",
+    "critical-threshold": 70,
+    "format": "{icon}",
+    "format-alt": "{temperatureC}°C {icon}",
+    "format-icons": ["", "", ""],
+    "tooltip-format": "Temperature:  {temperatureC}°C"
+  },
+  "modules-right": ["tray", "custom/reboot", "custom/backup", "pulseaudio", "temperature#cpu", "temperature#gpu", "idle_inhibitor", "clock"],
+  "include": "~/.config/waybar/config-base",
+}