From 17aa75afde86cfff39e1e7d4fcff83f5d21b4139 Mon Sep 17 00:00:00 2001
From: coast <coasteen@proton.me>
Date: Fri, 31 Oct 2025 22:28:42 +0330
Subject: [PATCH] waybar changes

---
 config/waybar/config.jsonc | 115 ++++------------------------------
 config/waybar/style.css    | 122 +------------------------------------
 2 files changed, 13 insertions(+), 224 deletions(-)

diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
index 8bb52c8..7f358ba 100644
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@@ -1,110 +1,23 @@
-<<<<<<< HEAD
-// -*- mode: jsonc -*-
-{
-    "layer": "bottom", 
-    "position": "bottom", 
-    "height": 30, 
-    "spacing": 4, 
-
-    // Choose the order of the modules
-    "modules-left": [
-        "hyprland/workspaces",
-        "custom/sep",
-        "hyprland/window",
-    ],
-
-    "modules-right": [
-        "battery",
-        "cpu",
-        "memory",
-     //   "disk",
-        "clock",
-        "tray"
-    ],
-
-    // Modules configuration
-    "hyprland/workspaces": {
-        "disable-scroll": true,
-        "all-outputs": true,
-        "warp-on-scroll": false,
-        "format": "{name}",
-        "persistent-workspaces": {
-            "1": "1",
-            "2": "2",
-            "3": "3",
-            "4": "4",
-            "5": "5",
-            "6": "6",
-            "7": "7",
-            "8": "8",
-            "9": "9",
-        },
-    },
-    "hyprland/window" : {
-        "max-length": 40,
-        "seperate-outputs": false
-    },
-    "tray": {
-        // "icon-size": 21,
-        "spacing": 10
-        // "icons": {
-        //   "blueman": "bluetooth",
-        //   "TelegramDesktop": "$HOME/.local/share/icons/hicolor/16x16/apps/telegram.png"
-        // }
-    },
-    "clock": {
-    "format": "{:%I:%M %p}",
-    "format-alt": "{:%Y-%m-%d %I:%M %p}"
-},
-    "cpu": {
-        "format": "CPU: {usage}%",
-        "tooltip": false
-    },
-    "memory": {
-        "format": "MEM: {used}GiB"
-    },
-    "disk": {
-        "interval": 60,
-        "path": "/",
-        "format": "DISK: {free} (free)"
-    },
-    "battery": {
-        "states": {
-            "good": 95,
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "BAT: {capacity}%{time}",
-        "format-plugged": "",
-        "format-alt": "Bat {capacity}%",
-        "format-time": "{H}:{M}",
-    },
-    "network": {
-        "format": "Online",
-        "format-disconnected": "Disconnected ⚠"
-    },
-    "custom/sep": {
-        "format" : " ",
-        "interval" : 0
-=======
 {
     "layer": "top",
     "modules-left": [
         "sway/workspaces",
-        "sway/mode",
         "sway/window"
     ],
+    "modules-center": [
+    ],
     "modules-right": [
-       "pulseaudio",
-       "clock",
-       "network",
-       "bluetooth",
+        "pulseaudio",
+        "clock",
+        "network"
+        //"bluetooth"
     ],
     "pulseaudio": {
         "tooltip": false,
         "scroll-step": 5,
         "format": "VOL {volume}%",
         "format-muted": "muted",
+        "on-click": "~/.config/dunst/volume.sh mute",
         "format-icons": {
             "default": [
                 "",
@@ -113,10 +26,6 @@
             ]
         }
     },
-    "sway/mode": {
-        "format": "{mode}",
-        "tooltip": false
-    },
     "privacy": {
         "icon-spacing": 10,
         "icon-size": 18,
@@ -147,7 +56,7 @@
         "tooltip-format-connected": "{device_alias}"
     },
     "clock": {
-        "format": "TIME {:%I:%M %p}",
+        "format": "TIME {:%H:%M}",
         "tooltip": true,
         "tooltip-format": "{:%a, %b %d}"
     },
@@ -159,9 +68,9 @@
         "icon-size": 20
     },
     "network": {
-        "interface": "wlo1",
-        "format-wifi": "NET {ipaddr}",
-        "format-ethernet": "NET {ipaddr}/{cidr}",
+        "interface": "eno1",
+        "format-wifi": "WLAN {essid}",
+        "format-ethernet": "ETH {ipaddr}/{cidr}",
         "format-disconnected": "disconnected",
         "tooltip": false,
         "max-length": 50
@@ -184,6 +93,6 @@
         "format-charging": "{icon} +: {capacity}%",
         "format-discharging": "{icon} -: {capacity}%",
         "tooltip-format": "{power}W, {cycles} cycles"
->>>>>>> bd52954 (repush)
     }
 }
+
diff --git a/config/waybar/style.css b/config/waybar/style.css
index e3a061a..3b138ce 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -1,122 +1,3 @@
-<<<<<<< HEAD
-@define-color bg    #1c1c1c;
-@define-color fg    #B0B0B0;
-@define-color blk   #000000;
-@define-color white #ffffff;
-
-* {
-    font-family: "UbuntuMono", monospace;
-    font-size: 18px;
-    font-weight: bold;
-}
-
-button,
-#workspaces button,
-#clock,
-#battery,
-#cpu,
-#memory,
-#disk,
-#network,
-#tray {
-    transition-property: none;
-    animation: none;
-    margin-top: 4px;
-}
-
-window#waybar {
-    background-color: @bg;
-    color: @fg;
-}
-
-#workspaces button {
-    padding: 0 6px;
-    color: @fg;
-    background: transparent;
-    border-bottom: 3px solid @bg;
-}
-
-#workspaces button.active {
-    color: @fg;
-    border-bottom: 3px solid @fg;
-}
-
-#workspaces button.empty {
-    color: @fg;
-}
-
-#workspaces button.empty.active {
-    color: @fg;
-    border-bottom: 3px solid @fg;
-}
-
-#workspaces button.urgent {
-    background-color: @blk;
-}
-
-/* Disable hover effects completely */
-button:hover,
-#workspaces button:hover {
-    background: transparent;
-    box-shadow: none;
-    color: inherit;
-}
-
-#clock,
-#custom-sep,
-#battery,
-#cpu,
-#memory,
-#disk,
-#network,
-#tray {
-    padding: 0 8px;
-    color: @white;
-}
-
-#custom-sep {
-    color: @fg;
-}
-
-#clock {
-    color: @fg;
-    border-bottom: 4px solid @fg;
-}
-
-#battery {
-    color: @fg;
-    border-bottom: 4px solid @fg;
-}
-
-#disk {
-    color: @fg;
-    border-bottom: 4px solid @fg;
-}
-
-#memory {
-    color: @fg;
-    border-bottom: 4px solid @fg;
-}
-
-#cpu {
-    color: @fg;
-    border-bottom: 4px solid @fg;
-}
-
-#network {
-    color: @fg;
-    border-bottom: 4px solid @fg;
-}
-
-#network.disconnected {
-    background-color: @blk;
-}
-
-#tray {
-    background-color: @bg;
-}
-
-=======
 @define-color border #6f3913;
 
 * {
@@ -166,7 +47,7 @@ window#waybar.empty #window {
     margin: 5px 0 0 15px;
 }
 
-#bluetooth {
+#network {
     margin: 5px 15px 0 10px;
 }
 
@@ -202,4 +83,3 @@ window#waybar.empty #window {
 * {
     transition: none;
 }
->>>>>>> bd52954 (repush)