neovim update; removed unused files; dont now what else. whoops

packages/waybar/config

@@ -1,29 +1,24 @@
 {
   "layer": "bottom",
   "position": "top",
-  "height": 35,
+  "height": 38,
   "spacing": 0,
-  "modules-left": ["clock", "sway/workspaces","sway/mode"],
-  "modules-center": ["sway/window"],
-  "modules-right": ["network", "battery", "cpu", "memory", "custom/keyboard-layout", "pulseaudio", "tray"],
+  "modules-left": ["clock", "hyprland/workspaces", "hyprland/submap"],
+  "modules-center": [ ],
+  "modules-right": ["network", "battery", "cpu", "memory", "custom/keyboard-layout", "custom/notification", "pulseaudio", "tray"],
 
 "custom/keyboard-layout": {
   "interval": 1,
-  "exec": "swaymsg -t get_inputs | jq -r '.[] | select(.type == \"keyboard\") | .xkb_active_layout_name'"
+  "exec": "hyprctl devices -j |  jq -r '.keyboards[] | .active_keymap' |  head -n1 |  cut -c1-2 |  tr 'a-z' 'A-Z'"
+},
+
+"custom/notification": {
+  "on-click": "swaync-client -t",
+  "format": "♥"
 },
 
 
-  "cpu": {
-    "interval": 5,
-    "format": "CPU: {usage}% {avg_frequency} GHz"
-  },
-
-  "memory": {
-    "interval": 5,
-    "format": "RAM: {used} GiB"
-  },
-
-  "battery": {
+    "battery": {
     "bat": "BAT0",
     "states": {
       "good": 90,
@@ -37,6 +32,17 @@
         "format-icons": ["",  "", "" , "", ""] 
   },
 
+  "cpu": {
+    "interval": 5,
+    "format": "CPU: {usage}% {avg_frequency} GHz"
+  },
+
+  "memory": {
+    "interval": 5,
+    "format": "RAM: {used} GiB"
+  },
+
+
   "pulseaudio": {
     "format": "{icon}   {volume}%",
     "format-muted": " Muted",