changes from desktop

.config/waybar/config.jsonc

@@ -1,13 +1,16 @@
 {
+  "command": "waybar",
   "layer": "top",
-  "position": "top",
+  "position": "bottom",
+  "ipc": true,
   "modules-left": [
-	"tray",
-	"custom/cpu_linux",
+    "tray",
+    // "custom/cpu_linux",
+    "cpu",
     "temperature",
     "memory",
     "disk",
-    "custom/nvidia",
+    "custom/nvidia"
   ],
   "modules-center": [
     "sway/window"
@@ -20,17 +23,11 @@
     "group/audio",
     "group/networking",
     "battery",
-	"clock"
+    "clock"
   ],
-  // layout
-  "margin": 0,
   "spacing": 15,
   "reload_style_on_change": true,
-  "custom/logo": {
-    "format": "󰊠",
-    "tooltip": false,
-    "on-click": "~/.config/rofi/scripts/powermenu.sh"
-  },
+
   "clock": {
     "format": "{:%a %d.%m.%y | Week: %U | %T}",
     "interval": 1,
@@ -41,52 +38,49 @@
     "format-calendar-weeks": "<span color='#aeaeae'><b>W{:%V}</b></span>",
     "format-calendar-weekdays": "<span color='#aeaeae'><b>{}</b></span>"
   },
+
   "disk": {
     "interval": 30,
     "format": " {percentage_used}% {free:2} free",
     "path": "/"
   },
+
   "memory": {
     "format": " {percentage}% {used:.1f}/{total:.1f} S: {swapUsed:.1f}/{swapTotal:.1f}"
   },
+
+  "cpu": {
+    "interval": 1,
+    "format": "{usage}% "
+  },
+
   "custom/cpu_linux": {
-	"exec": "~/.config/waybar/scripts/cpu_linux.sh",
-	"return-type": "json",
+    "exec": "~/bin/cpu_linux.sh",
+    "return-type": "json",
     "interval": 2,
     "format": ": {text}%"
   },
-  "cpu": {
-    "interval": 1,
-    "format": " {usage}%",
-    "format-icons": [
-      "▁",
-      "▂",
-      "▃",
-      "▄",
-      "▅",
-      "▆",
-      "▇",
-      "█"
-    ]
-  },
+
   "custom/nvidia": {
     "exec": "nvidia-smi --query-gpu=utilization.gpu,temperature.gpu --format=csv,nounits,noheader | sed 's/\\([0-9]\\+\\), \\([0-9]\\+\\)/\\1% @ \\2°C/g'",
     "format": "  {}",
     "interval": 4
   },
+
   "temperature": {
     "format": " {temperatureC}°C",
-	//"thermal_zone": 10,
-	"hwmon-path": "/sys/devices/platform/coretemp.0/hwmon/hwmon7/temp1_input",
+    "hwmon-path": "/sys/devices/platform/coretemp.0/hwmon/hwmon7/temp1_input",
     "format-critical": " {temperatureC}°C",
     "interval": 1,
     "critical-threshold": 80,
     "on-click": "psensor"
   },
+
   "tray": {
     "icon-size": 14,
     "spacing": 5
   },
+
   "idle_inhibitor": {
     "format": "<span font='12'>{icon}</span>",
     "format-icons": {
@@ -94,6 +88,7 @@
       "deactivated": "󰅶"
     }
   },
+
   "bluetooth": {
     "format-on": "󰂰",
     "format-off": "",
@@ -104,8 +99,9 @@
     "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
     "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
     "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
-    "on-click": "rofi-bluetooth",
+    "on-click": "rofi-bluetooth"
   },
+
   "pulseaudio": {
     "format": "{volume}% {icon}",
     "format-bluetooth": "󰂰",
@@ -119,18 +115,16 @@
       "phone": "",
       "portable": "",
       "car": "",
-      "default": [
-        ""
-      ]
+      "default": [""]
     },
     "scroll-step": 5,
     "justify": "center",
     "on-click": "pamixer -t",
     "on-click-right": "pavucontrol",
-    "tooltip-format": "{volume}%  {icon}",
     "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +5%",
     "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -5%"
   },
+
   "pulseaudio#mic": {
     "format": "{format_source}",
     "format-source": "",
@@ -140,20 +134,17 @@
     "on-scroll-down": "pactl set-source-volume 1 -1%",
     "on-scroll-up": "pactl set-source-volume 1 +1%"
   },
+
   "group/audio": {
     "orientation": "horizontal",
-    "modules": [
-      "pulseaudio",
-      "pulseaudio#mic"
-    ]
+    "modules": ["pulseaudio", "pulseaudio#mic"]
   },
+
   "group/networking": {
     "orientation": "horizontal",
-    "modules": [
-      "network",
-	  "network#speed"
-    ]
+    "modules": ["network", "network#speed"]
   },
+
   "network": {
     "format-wifi": "  {essid}",
     "format-ethernet": "󰈀",
@@ -164,16 +155,18 @@
     "tooltip-format-disconnected": "Not Connected",
     "on-click": "networkmanager_dmenu"
   },
+
   "network#speed": {
     "format": "󰁅 {bandwidthDownBits:20} 󰁝 {bandwidthUpBits:20}",
     "interval": 1,
+    "tooltip": true,
     "tooltip-format": "{ipaddr}",
     "tooltip-format-wifi": "{essid} ({signalStrength}%)   \n{ipaddr} | {frequency} MHz{icon} ",
     "tooltip-format-ethernet": "{ifname} 󰈀 \n{ipaddr} | {frequency} MHz{icon} ",
     "tooltip-format-disconnected": "Not Connected",
-    "tooltip": true,
     "on-click": "networkmanager_dmenu"
   },
+
   "battery": {
     "interval": 4,
     "states": {
@@ -181,24 +174,14 @@
       "warning": 30,
       "critical": 20
     },
-    "tooltip": true,
     "format": "{capacity}% <span font='16px'>{icon}</span> {power:.2f}W {time}",
     "format-time": "{H}h {M}min",
     "tooltip": "{time}",
-    //"format-charging": "{capacity}% <span font='16px'>{icon}</span> {time}%",
-    "format-charging": "{capacity}% Full at {full-at}%",
+    "format-charging": "{capacity}% Full at {timeTo}%",
     "format-plugged": "{capacity}% 󰠠",
-    //"format-plugged": "{capacity}% 󰠠",
-    // "format-alt": "{time} {icon}",
     "format-icons": [
-      "󰪞",
-      "󰪟",
-      "󰪠",
-      "󰪡",
-      "󰪢",
-      "󰪣",
-      "󰪤",
-      "󰪥"
+      "󰪞", "󰪟", "󰪠", "󰪡",
+      "󰪢", "󰪣", "󰪤", "󰪥"
     ]
   }
-}
+}