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",

packages/waybar/config~

@@ -9,7 +9,7 @@
 
 "custom/keyboard-layout": {
   "interval": 1,
-  "exec":"swaymsg -t get_inputs --raw | jq -r '.[] | .xkb_active_layout_name'" 
+  "exec": "swaymsg -t get_inputs | jq -r '.[] | select(.type == \"keyboard\") | .xkb_active_layout_name'"
 },
 
 

packages/waybar/style.css

@@ -22,6 +22,8 @@ window#waybar {
 #network,
 #pulseaudio,
 #custom-keyboard-layout,
+#custom-notification,
+#tray,
 #battery{
 	background: rgba(10,10,10,100);
 	opacity: 0.8;
@@ -38,7 +40,7 @@ window#waybar {
 	margin-left: 6px;
 }
 
-#workspaces button.focused{
+#workspaces button.active{
 	background: @mauve;
 	color: @base;
 	opacity: 0.8;
@@ -64,12 +66,11 @@ window#waybar {
 	border-radius: 10px 0px 0px 10px;
 }
 
-#pulseaudio{
+#tray{
 	border-radius: 0px 10px 10px 0px;
 	margin-right: 5px
 }
 
-
 #workspaces{
 	border-radius: 0px 10px 10px 0px;
 }

packages/waybar/style.css~

@@ -21,7 +21,6 @@ window#waybar {
 #memory,
 #network,
 #pulseaudio,
-#custom-keyboard-layout,
 #battery{
 	background: rgba(10,10,10,100);
 	opacity: 0.8;
@@ -69,12 +68,6 @@ window#waybar {
 	margin-right: 5px
 }
 
-#custom-keyboard-layout{
-    border-radius: 0px 10px 10px 0px;
-    color: @mauve;
-}
-
-
 #workspaces{
 	border-radius: 0px 10px 10px 0px;
 }