From 3024add81422ea5395df6e7422521554342753d6 Mon Sep 17 00:00:00 2001
From: ayushDumasia <220170107033@gmail.com>
Date: Tue, 4 Mar 2025 09:01:21 +0530
Subject: [PATCH] Minor changes in waybar

---
 waybar/config       | 168 --------------------------------------------
 waybar/config.jsonc |  22 ++++--
 waybar/style.css    |  13 ++--
 3 files changed, 22 insertions(+), 181 deletions(-)
 delete mode 100644 waybar/config

diff --git a/waybar/config b/waybar/config
deleted file mode 100644
index a0d9029..0000000
--- a/waybar/config
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-  "layer": "top",
-  // "position": "bottom",
-  "margin-left": 8,
-  "margin-right": 8,
-  "margin-top": 2,
-  "margin-bottom": 0,
-  "modules-left": ["hyprland/workspaces", "cpu", "memory", "network#speed"],
-  "modules-center": [
-    "clock"
-  ],
-  "modules-right": [
-    "temperature#gpu",
-    "custom/transparency",
-    "custom/wallpaper",
-    "pulseaudio",
-    "backlight",
-    "network",
-    // "bluetooth",
-    "battery"
-  ],
-  "temperature#gpu": {
-    "thermal-zone": 5,
-    "critical-threshold": 80,
-    "format-critical": "{temperatureC}°C ",
-    "format": "{temperatureC}°C ",
-    "tooltip": false
-  },
-  "backlight": {
-    "device": "intel_backlight",
-    "scroll-step": 5,
-    "format": "{icon}",
-    "format-icons": ["󰃞 ", "󰃟 ", "󰃝 ", "󰃠 "],
-    "tooltip": true,
-    "tooltip-format": "{percent}%"
-  },
-  "network#speed": {
-    "interval": 1,
-    "format": "{ifname}%%",
-    "format-wifi": " {bandwidthDownBytes}  {bandwidthUpBytes}",
-    "format-ethernet": " {bandwidthDownBytes}  {bandwidthUpBytes} ",
-    "format-disconnected": "󰌙",
-    "tooltip-format": "{ipaddr}",
-    "format-linked": "󰈁 {ifname} (No IP)",
-    "tooltip-format-wifi": "{essid} {icon} {signalStrength}%",
-    "tooltip-format-ethernet": "{ifname} 󰌘",
-    "tooltip-format-disconnected": "󰌙 Disconnected",
-    "max-length": 22,
-    "min-length": 20,
-    "format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"]
-  },
-  "keyboard-state": {
-    "numlock": true,
-    "capslock": true,
-    "scrolllock": false,
-    "format": "{name} {icon}",
-    "format-icons": {
-      "locked": "\uf023",
-      "unlocked": "\uf3c1"
-    }
-  },
-  "custom/launcher": {
-    "format": "",
-    "tooltip": false,
-    "on-click": "~/.config/rofi/launcher/launcher.sh"
-  },
-  "custom/transparency": {
-    "format": " ",
-    "tooltip": false,
-    "on-click": "~/.config/waybar/scripts/toggle-trans.sh",
-    "format-alt": " "
-  },
-  "cpu": {
-    "interval": 1,
-    "format": "{usage}% <span font='Font Awesome 6 Free-Solid'>\uf2db</span>",
-    "on-click": "kitty btop"
-  },
-  "memory": {
-    "interval": 1,
-    "format": "{percentage}% <span font='Font Awesome 5 Free'>\uf538</span>",
-    "on-click": "kitty btop",
-    "tooltip-format": "{used}/{total} GiB"
-  },
-  "hyprland/workspaces": {
-    "all-outputs": true,
-    "warp-on-scroll": true,
-    "enable-bar-scroll": true,
-    "disable-scroll-wraparound": false,
-    "format": " {icon} ",
-    "format-icons": {
-      "active": "●",
-      "default": "○"
-    },
-    "persistent-workspaces": {
-      "*": 3
-    },
-    "on-click": "activate",
-    "on-scroll-up": "hyprctl dispatch workspace e-1",
-    "on-scroll-down": "hyprctl dispatch workspace e+1"
-  },
-  "custom/weather": {
-    "format": "{}°C",
-    "tooltip": false,
-    "interval": 3600,
-    "exec": "wttrbar --location 'Ahmedabad'",
-    "return-type": "json"
-  },
-
-  "clock": {
-    "format": "{:%I:%M %p • %a %d/%m}",
-    "tooltip": true,
-    "tooltip-format": "<tt>{calendar}</tt>"
-  },
-  "custom/wallpaper": {
-    "format": "\uf03e",
-    "on-click": "~/.config/waybar/scripts/change-wallpaper.sh && hyprpaper",
-    "tooltip": false
-  },
-  "network": {
-    "format-wifi": " {icon}",
-    "format-ethernet": "󰈀",
-    "format-icons": ["󰤯 ", "󰤟 ", "󰤢 ", "󰤢 ", "󰤨 "],
-    "format-disconnected": "󰪎",
-    "interval": 5,
-    "tooltip-format-wifi": " {bandwidthDownBytes} |  {bandwidthUpBytes} | {essid}",
-    "tooltip-format-disconnected": "Disconnected",
-    "on-click": "exec ~/.config/rofi/wifi/wifi.sh",
-    "on-click-right": "alacritty -e nmtui"
-  },
-  "battery": {
-    "states": {
-      "good": 95,
-      "warning": 30,
-      "critical": 15
-    },
-    "format": " {capacity}% {icon} ",
-    "format-full": "{icon}",
-    "format-plugged": " {capacity}% <span font='Font Awesome 5 Free'>\uf0e7</span> ",
-    "format-alt": "{icon}",
-    "tooltip-format": "{capacity}%, about {time} left",
-    "format-icons": [" ", " ", " ", " "]
-  },
-  "pulseaudio": {
-    "format": "<span font='Font Awesome 5 Free'>{icon}</span>",
-    "format-muted": "<span font='Font Awesome 5 Free'>\uf6a9</span>",
-    "format-icons": {
-      "headphone": "\uf025",
-      "default": ["\uf028"]
-    },
-    "tooltip-format": "{volume}% {desc}",
-    "on-click": "pamixer -t"
-  },
-  "bluetooth": {
-    "format": "{icon}",
-    "format-icons": ["", "󰤾", "󰥀", "󰥄", "󰥈"],
-
-    "tooltip-format-off": "Bluetooth is off",
-    "tooltip-format-on": "Bluetooth is on",
-
-    "format-connected": "{icon} {num_connections}",
-    "format-connected-battery": "{icon} {device_battery_percentage}%",
-
-    "tooltip-format-connected": "{device_enumerate}",
-    "tooltip-format-enumerate-connected": "{device_alias}\t{device_battery_percentage}%",
-
-    "on-click": "blueman-manager"
-  }
-}
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 38934a0..ef371b5 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -1,11 +1,14 @@
 {
-r "layer": "top",
-  "margin-left": 8,
-  "margin-right": 8,
+  "layer": "top",
+  // "position": "bottom",
+  "margin-left": 3,
+  "margin-right": 3,
   "margin-top": 2,
-  "margin-bottom": 2,
+  "margin-bottom": 0,
   "modules-left": ["hyprland/workspaces", "cpu", "memory", "network#speed"],
-  "modules-center": ["clock", "custom/weather"],
+  "modules-center": [
+    "clock"
+  ],
   "modules-right": [
     "temperature#gpu",
     "custom/transparency",
@@ -13,7 +16,7 @@ r "layer": "top",
     "pulseaudio",
     "backlight",
     "network",
-    "bluetooth",
+    // "bluetooth",
     "battery"
   ],
   "temperature#gpu": {
@@ -64,7 +67,7 @@ r "layer": "top",
   "custom/transparency": {
     "format": " ",
     "tooltip": false,
-    "on-click": "~/.local/bin/toggleTrans.sh",
+    "on-click": "~/.config/waybar/scripts/toggle-trans.sh",
     "format-alt": " "
   },
   "cpu": {
@@ -83,6 +86,11 @@ r "layer": "top",
     "warp-on-scroll": true,
     "enable-bar-scroll": true,
     "disable-scroll-wraparound": false,
+    "format": " {icon} ",
+    "format-icons": {
+      "active": "●",
+      "default": "○"
+    },
     "persistent-workspaces": {
       "*": 3
     },
diff --git a/waybar/style.css b/waybar/style.css
index 5e1291f..1488b38 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -74,7 +74,7 @@ tooltip {
 }
 
 #workspaces {
-  background: #1e1e2e;
+  background: @raisin-black;
   margin: 0;
   padding: 0;
   font-weight: bold;
@@ -91,7 +91,7 @@ tooltip {
   border-radius: 6px;
   border: none;
   color: #f5e0dc;
-  background-color: #1e1e2e;
+  /* background-color: #1e1e2e; */
   transition: all 0.3s ease-in-out;
   opacity: 0.4;
 }
@@ -149,9 +149,9 @@ tooltip {
 #pulseaudio,
 #backlight {
   padding: 0 8px;
-  /* margin: 0 2px; */
+  margin: 0 2px;
   color: @beige;
-  border-radius: 6px 0 0 6px;
+  border-radius: 6px 6px;
 }
 
 #bluetooth,
@@ -179,7 +179,8 @@ tooltip {
   min-width: 30px;
   padding: 0 7px 0 2px;
   /* margin: 0 2px; */
-  border-radius: 0 6px 6px 0;
+  border-radius: 6px;
+  /* border-radius: 0 6px 6px 0; */
 }
 
 #battery {
@@ -199,7 +200,7 @@ tooltip {
 
 #battery.good:not(.charging) {
   color: #f9e2af; /* Peach */
-  background: #1e1e2e; /* Base */
+  /* background: #1e1e2e; Base */
   border-radius: 6px;
 }