diff --git a/Configs/.config/waybar/config.jsonc b/Configs/.config/waybar/config.jsonc
index 3006ef4..2691b25 100644
--- a/Configs/.config/waybar/config.jsonc
+++ b/Configs/.config/waybar/config.jsonc
@@ -43,7 +43,9 @@
"on-click": "~/.config/waybar/scripts/idle-inhibitor.sh --toggle",
"return-type": "json",
"tooltip": true,
- "interval": 10
+ "interval": 10,
+ "min-length": 2,
+ "max-length": 2
},
"hyprland/workspaces": {
@@ -128,8 +130,8 @@
"return-type": "json",
"tooltip": true,
"interval": 5,
- "min-length": 7,
- "max-length": 7
+ "min-length": 6,
+ "max-length": 6
},
"custom/cpuinfo": {
"exec": "~/.config/waybar/scripts/cpuinfo.sh",
@@ -137,8 +139,8 @@
"format": "{}",
"tooltip": true,
"interval": 5,
- "min-length": 7,
- "max-length": 7
+ "min-length": 6,
+ "max-length": 6
},
"memory": {
@@ -150,16 +152,16 @@
"tooltip": true,
"tooltip-format": "Memory Used: {used:0.1f} GB / {total:0.1f} GB",
"interval": 5,
- "min-length": 7,
- "max-length": 7
+ "min-length": 6,
+ "max-length": 6
},
"clock#time": {
"format": " {:%H:%M}",
"tooltip": true,
"tooltip-format": "12-hour Format: {:%I:%M %p}",
- "min-length": 8,
- "max-length": 8
+ "min-length": 7,
+ "max-length": 7
},
"clock#date": {
@@ -167,17 +169,19 @@
"tooltip-format": "{calendar}",
"calendar": {
"mode": "month",
- "mode-mon-col": 6,
+ "mode-mon-col": 4,
"on-click-right": "mode",
"format": {
- "today": "{}"
+ "today": "{}"
}
},
"actions": {
- "on-click-right": "mode"
+ "on-click-right": "mode",
+ "on-scroll-up": "shift_up",
+ "on-scroll-down": "shift_down"
},
- "min-length": 8,
- "max-length": 8
+ "min-length": 7,
+ "max-length": 7
},
@@ -229,8 +233,8 @@
"format-en": "EN",
"format-ru": "RU",
"on-click": "hyprctl switchxkblayout current next",
- "min-length": 6,
- "max-length": 6
+ "min-length": 4,
+ "max-length": 4
},
"pulseaudio": {
@@ -249,8 +253,8 @@
"on-click": "~/.config/waybar/scripts/volumecontrol.sh -o m",
"on-scroll-up": "~/.config/waybar/scripts/volumecontrol.sh -o i",
"on-scroll-down": "~/.config/waybar/scripts/volumecontrol.sh -o d",
- "min-length": 7,
- "max-length": 7
+ "min-length": 6,
+ "max-length": 6
},
"custom/backlight": {
@@ -261,8 +265,8 @@
"on-scroll-up": "~/.config/waybar/scripts/brightnesscontrol.sh -o i",
"on-scroll-down": "~/.config/waybar/scripts/brightnesscontrol.sh -o d",
"interval": 1,
- "min-length": 7,
- "max-length": 7
+ "min-length": 6,
+ "max-length": 6
},
"power-profiles-daemon": {
@@ -275,8 +279,8 @@
"balanced": "",
"power-saver": ""
},
- "min-length": 2,
- "max-length": 2
+ "min-length": 1,
+ "max-length": 1
},
"battery": {
@@ -303,8 +307,8 @@
"tooltip-format": "Time to Empty: {time}",
"tooltip-format-charging": "Time to Full: {time}",
"interval": 5,
- "min-length": 7,
- "max-length": 7
+ "min-length": 6,
+ "max-length": 6
},
"custom/power": {
diff --git a/Configs/.config/waybar/scripts/idle-inhibitor.sh b/Configs/.config/waybar/scripts/idle-inhibitor.sh
index dd6bcca..b7461ed 100755
--- a/Configs/.config/waybar/scripts/idle-inhibitor.sh
+++ b/Configs/.config/waybar/scripts/idle-inhibitor.sh
@@ -14,9 +14,9 @@ toggle() {
status_json() {
if [[ -f "$PID_FILE" ]] && kill -0 "$(cat "$PID_FILE")" 2>/dev/null; then
- echo '{"text":" ","tooltip":"Idle Inhibitor: On"}'
+ echo '{"text":" ","tooltip":"Idle Inhibitor: On"}'
else
- echo '{"text":" ","tooltip":"Idle Inhibitor: Off"}'
+ echo '{"text":" ","tooltip":"Idle Inhibitor: Off"}'
fi
}
diff --git a/Configs/.config/waybar/styles.css b/Configs/.config/waybar/styles.css
index c99c56d..a9b888f 100644
--- a/Configs/.config/waybar/styles.css
+++ b/Configs/.config/waybar/styles.css
@@ -5,8 +5,7 @@
border: none;
font-family: "JetBrainsMono Nerd Font";
font-weight: bold;
- font-size: 14.8px;
- min-height: 14.8px;
+ font-size: 14px;
color: @foreground;
}
@@ -15,17 +14,20 @@ window#waybar {
}
window#waybar > box {
- margin: 6px 4px 0 4px;
+ margin: 5px 6px 0 6px;
+ padding: 2px 0;
+ background-color: @background;
+ border-radius: 15px;
+ border: 2px solid @selected;
}
/* -- Tooltip Styling -- */
tooltip {
- color: @foreground;
- background: @tooltip;
+ background: @background;
border: solid;
- border-width: 0.7px;
+ border-width: 1px;
border-radius: 10px;
- border-color: @foreground;
+ border-color: @selected;
}
/* -- General Module Styling -- */
@@ -47,31 +49,25 @@ tooltip {
#battery,
#custom-power {
opacity: 1;
- padding: 3px 6px;
- margin: 0 3px;
- border-radius: 10px;
- text-shadow: 0px 0px 2px rgba(22, 22, 22, 0.8);
+ padding: 0px 3px;
+ margin: 0px 3px;
}
/* -- Left Modules -- */
+.modules-left {
+ margin-left: 6px;
+}
+
/* Idle Inhibitor */
#custom-idle_inhibitor {
- background: @logo;
- margin-left: 6px;
- padding-right: 7px;
- padding-left: 2px;
+ padding: 0 0 0 4px;
}
/* Workspaces */
-#workspaces {
- background: @workspaces;
-}
-
/* Workspace Button */
#workspaces button {
color: @foreground;
border-radius: 8px;
- box-shadow: none;
margin: 2px 1px;
padding: 0 2px;
animation: ws_normal 20s ease-in-out 1;
@@ -79,9 +75,7 @@ tooltip {
/* Active Workspace Button */
#workspaces button.active {
- color: @active-fg;
- background: @active-bg;
- text-shadow: 0px 0px 2px rgba(22, 22, 22, 0.6);
+ background: @selected;
margin-right: 2px;
margin-left: 2px;
padding: 0 5px;
@@ -91,176 +85,65 @@ tooltip {
/* Hover Effect for Workspace Buttons */
#workspaces button:hover {
- color: @hover-fg;
- background: @hover-bg;
- box-shadow: none;
+ background: @selected;
animation: ws_hover 20s ease-in-out 1;
transition: all 0.3s cubic-bezier(0.55, -0.68, 0.48, 1.682);
}
-/* Window Title */
-#window {
- background: @window;
- padding-right: 10px;
- padding-left: 10px;
-}
-
-/* -- Central Modules -- */
-#custom-cpu,
-#custom-cpuinfo,
-#memory,
-#clock.time,
-#clock.date {
- margin-left: 0;
- margin-right: 0;
- border-radius: 0;
- padding: 3px 3px;
-}
-
-/* CPU */
-#custom-cpu {
- background: @cpu;
- border-top-left-radius: 10px;
- border-bottom-left-radius: 10px;
- margin-left: 6px;
- padding-left: 6px;
-}
-
-/* CPU Temperature */
-#custom-cpuinfo {
- background: @cpuinfo;
-}
-
-/* Memory */
-#memory {
- background: @memory;
-}
-
-/* Time */
-#clock.time {
- background: @time;
-}
-
-/* Date */
-#clock.date {
- background: @date;
- border-top-right-radius: 10px;
- border-bottom-right-radius: 10px;
- margin-right: 6px;
- padding-right: 6px;
-}
-
/* -- Right Modules -- */
-
/* Network */
#network {
- background: @network;
- padding-right: 8px;
- padding-left: 8px;
font-size: 13px;
}
/* Tray */
#tray {
- padding-right: 8px;
- padding-left: 8px;
- background: @tray;
+ padding: 0 6px;
+ background: @background;
}
#tray menu {
- color: @foreground;
border-radius: 10px;
- background: @tooltip;
-}
-
-#tray menu separator {
- min-height: 3px;
+ background: @background;
}
#tray menu menuitem {
- border-radius: 4px;
+ border-radius: 8px;
}
#tray menu menuitem:hover {
- background-color: @hover;
+ background-color: @selected;
}
/* Privacy */
#privacy {
- background: @privacy;
- padding-right: 8px;
- padding-left: 8px;
-}
-
-#privacy-item.screenshare {
- padding-left: 3px;
-}
-
-/* Right modules group */
-#language,
-#pulseaudio,
-#custom-backlight,
-#power-profiles-daemon,
-#battery {
- margin-left: 0;
- margin-right: 0;
- border-radius: 0;
- padding: 3px 2px;
-}
-
-/* Language */
-#language {
- background: @language;
- border-top-left-radius: 10px;
- border-bottom-left-radius: 10px;
- margin-left: 3px;
- padding-left: 6px;
-}
-
-/* PulseAudio */
-#pulseaudio {
- background: @pulseaudio;
-}
-
-/* Brightness */
-#custom-backlight {
- background: @backlight;
+ background-color: #005000;
+ border-radius: 6px;
+ padding: 0 6px;
}
/* Power Profiles */
#power-profiles-daemon {
- background: @power-profiles;
- padding-right: 2px;
-}
-
-/* Battery */
-#battery {
- background: @battery;
- border-top-right-radius: 10px;
- border-bottom-right-radius: 10px;
- margin-right: 3px;
padding-right: 6px;
}
+/* Battery */
#battery.warning {
- color: #f9e2af;
+ color: #f9da95;
}
#battery.critical {
- color: #f38ba8;
+ color: #f7668f;
}
/* Power Button */
#custom-power {
- background: @power;
- margin-right: 6px;
- padding-right: 5px;
- padding-left: 11px;
+ padding-right: 3px;
+ padding-left: 9px;
+ border-radius: 8px;
}
#custom-power:hover {
- color: @hover-fg;
- background: @power-hv;
- box-shadow: none;
+ background: @selected;
transition: all 0.3s cubic-bezier(0.55, -0.68, 0.48, 1.682);
}
diff --git a/Configs/.config/waybar/theme.css b/Configs/.config/waybar/theme.css
index 5ca3f6f..5185d7b 100644
--- a/Configs/.config/waybar/theme.css
+++ b/Configs/.config/waybar/theme.css
@@ -1,38 +1,5 @@
-/* General */
-@define-color background rgba(35, 35, 35, 0.95);
-@define-color foreground rgba(200, 200, 200, 1.0);
-@define-color hover rgba(200, 200, 200, 0.2);
-
-/* Workspace */
-@define-color active-bg rgba(150, 150, 150, 0.3);
-@define-color active-fg rgba(15, 15, 15, 1.0);
-@define-color hover-bg rgba(220, 220, 220, 0.2);
-@define-color hover-fg rgba(200, 200, 200, 1.0);
-
-/* Modules */
-@define-color module-bg rgba(37, 37, 37, 0.95);
-
-/* Left */
-@define-color tooltip @module-bg;
-@define-color logo @module-bg;
-@define-color workspaces @module-bg;
-@define-color window @module-bg;
-
-/* Central */
-@define-color cpu @module-bg;
-@define-color cpuinfo @module-bg;
-@define-color memory @module-bg;
-@define-color time @module-bg;
-@define-color date @module-bg;
-
-/* Right */
-@define-color network @module-bg;
-@define-color tray @module-bg;
-@define-color privacy @module-bg;
-@define-color language @module-bg;
-@define-color pulseaudio @module-bg;
-@define-color backlight @module-bg;
-@define-color power-profiles @module-bg;
-@define-color battery @module-bg;
-@define-color power @module-bg;
-@define-color power-hv rgba(50, 50, 50, 1);
+@define-color background #212121;
+@define-color background-alt #303030;
+@define-color foreground #b0b0b0;
+@define-color selected #444444;
+@define-color active #0F0F0F;