consolidate waybar config into single config file

config/niri/config.kdl

@@ -55,7 +55,7 @@ spawn-at-startup "awww-daemon"
 spawn-at-startup "foot" "--server"
 spawn-at-startup "lxqt-policykit-agent"
 spawn-at-startup "sh" "-c" "sleep 1 && ~/.local/bin/wallpaper.sh"
-spawn-at-startup "sh" "-c" "waybar --config ~/.config/waybar/niri-config --style ~/.config/waybar/style.css"
+spawn-at-startup "waybar"
 spawn-at-startup "swayidle" "-w" "timeout" "300" "swaylock -f -c 0a0a0a && ~/.local/bin/wallpaper.sh" "timeout" "600" "niri msg action power-off-monitors; wpctl set-mute @DEFAULT_AUDIO_SINK@ 1" "resume" "niri msg action power-on-monitors; wpctl set-mute @DEFAULT_AUDIO_SINK@ 0" "before-sleep" "swaylock -f -c 0a0a0a"
 
 binds {

config/waybar/config

@@ -4,16 +4,16 @@
   "height": 24,
   "margin-left": 250,
   "margin-right": 250,
-  "modules-left": ["custom/nurgle", "sway/workspaces"],
+  "modules-left": ["custom/nurgle", "niri/workspaces"],
 
   "custom/nurgle": {
     "format": " ",
     "tooltip": false
   },
   "modules-center": ["clock"],
-  "modules-right": ["custom/network", "cpu", "battery"],
+  "modules-right": ["custom/weather", "custom/network", "cpu", "battery"],
 
-  "sway/workspaces": {
+  "niri/workspaces": {
     "disable-scroll": true
   },
 
@@ -22,6 +22,13 @@
     "interval": 60
   },
 
+  "custom/weather": {
+    "exec": "~/.local/bin/waybar-weather.sh",
+    "interval": 1800,
+    "format": "{}",
+    "tooltip": false
+  },
+
   "custom/network": {
     "exec": "~/.local/bin/waybar-network.sh",
     "interval": 2,

config/waybar/niri-config

@@ -1,52 +0,0 @@
-{
-  "layer": "top",
-  "position": "top",
-  "height": 24,
-  "margin-left": 250,
-  "margin-right": 250,
-  "modules-left": ["custom/nurgle", "niri/workspaces"],
-
-  "custom/nurgle": {
-    "format": " ",
-    "tooltip": false
-  },
-  "modules-center": ["clock"],
-  "modules-right": ["custom/weather", "custom/network", "cpu", "battery"],
-
-  "niri/workspaces": {
-    "disable-scroll": true
-  },
-
-  "clock": {
-    "format": "{:%y-%m-%d (%a w%V) %H:%M}",
-    "interval": 60
-  },
-
-  "custom/weather": {
-    "exec": "~/.local/bin/waybar-weather.sh",
-    "interval": 1800,
-    "format": "{}",
-    "tooltip": false
-  },
-
-  "custom/network": {
-    "exec": "~/.local/bin/waybar-network.sh",
-    "interval": 2,
-    "format": "{}"
-  },
-
-  "cpu": {
-    "format": "CPU {usage}%",
-    "interval": 2
-  },
-
-  "battery": {
-    "format": "󰁹 {capacity}%",
-    "format-charging": "󱐋 {capacity}%",
-    "format-full": "󰁹 FULL",
-    "states": {
-      "warning": 30,
-      "critical": 15
-    }
-  }
-}