diff --git a/.config/waybar/config b/.config/waybar/config
index 6cfc93b..c4023c0 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,223 +1,211 @@
-
// Global
{
- "layer": "top",
- "position": "bottom",
-
- // If height property would be not present, it'd be calculated dynamically
- "height": 30,
-
- "modules-left": [
- "custom/launcher",
- "sway/workspaces",
- "sway/mode",
-
-
- ],
- "modules-center": [
- ],
-
- "modules-right": [
- "custom/firefox",
- "custom/seperator",
- "custom/files",
- "custom/seperator",
- "custom/terminal",
- "network",
- "memory",
- "cpu",
- "custom/weather",
- "pulseaudio",
- "custom/keyboard-layout",
- "battery",
- "backlight",
- "clock",
- "tray",
- "custom/power",
- ],
-
+ "layer": "top",
+ "position": "bottom",
+ // If height property would be not present, it'd be calculated dynamically
+ "height": 30,
+
+ "modules-left": [
+ "custom/launcher",
+ "sway/workspaces",
+ "sway/mode",
+ ],
+
+ "modules-center": [
+ ],
+
+ "modules-right": [
+ "custom/firefox",
+ "custom/files",
+ "custom/terminal",
+ "network",
+ "memory",
+ "cpu",
+ // "custom/weather",
+ "pulseaudio",
+ "custom/keyboard-layout",
+ "battery",
+ "backlight",
+ "clock",
+ "tray",
+ "custom/power",
+ ],
+
// Modules
- "sway/workspaces": {
- "disable-scroll": true,
+"sway/workspaces": {
+ "disable-scroll": true,
"all-outputs": false,
"format": "{icon}",
"format-icons": {
- "1": "",
- "2": "",
- "3": "",
- "4": "",
- "5": "",
- "6": "",
- "urgent": "",
- "focused": ",",
- "default": ""
- }
- },
- "sway/mode": {
- "format": "{}"
- },
-
- "battery": {
- "states": {
- // "good": 95,
- "warning": 30,
- "critical": 15
- },
- "format": "{capacity}% {icon}",
- "format-charging": "{capacity}% ",
- "format-plugged": "{capacity}% ",
- "format-alt": "{time} {icon}",
- // "format-good": "", // An empty format will hide the module
- // "format-full": "",
- "format-icons": ["", "", "", "", ""]
- },
-
- "clock#time": {
- "interval": 1,
- "format": "{:%H:%M:%S}",
- "tooltip": false
- },
-
- "clock": {
- "interval": 10,
- "format-alt": " {:%e %b %Y}", // Icon: calendar-alt
- "format": "{:%H:%M}",
- "tooltip-format": "{:%e %B %Y}"
- },
-
- "cpu": {
+ "1": "",
+ "2": "",
+ "3": "",
+ "4": "",
+ "5": "",
+ "6": "",
+ "urgent": "",
+ "focused": ",",
+ "default": ""
+ }
+},
+
+"battery": {
+ "states": {
+ // "good": 95,
+ "warning": 30,
+ "critical": 15
+ },
+ "format": "{capacity}% {icon}",
+ "format-charging": "{capacity}% ",
+ "format-plugged": "{capacity}% ",
+ "format-alt": "{time} {icon}",
+ // "format-good": "", // An empty format will hide the module
+ // "format-full": "",
+ "format-icons": ["", "", "", "", ""]
+},
+
+
+"clock": {
+ "interval": 10,
+ "format-alt": " {:%e %b %Y}", // Icon: calendar-alt
+ "format": "{:%H:%M}",
+ "tooltip-format": "{:%e %B %Y}"
+},
+
+"cpu": {
"interval": 5,
"format": " {usage}% ({load})", // Icon: microchip
"states": {
- "warning": 70,
- "critical": 90
+ "warning": 70,
+ "critical": 90
},
- "on-click": "exec htop",
- },
-
- "custom/keyboard-layout": {
- "exec": "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4",
- // Interval set only as a fallback, as the value is updated by signal
- "interval": 30,
- "format": " {}", // Icon: keyboard
- // Signal sent by Sway key binding (~/.config/sway/key-bindings)
- "signal": 1, // SIGHUP
- "tooltip": false
- },
-
- "memory": {
+ "on-click": "exec htop",
+},
+
+"custom/keyboard-layout": {
+ "exec": "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4",
+ // Interval set only as a fallback, as the value is updated by signal
+ "interval": 30,
+ "format": " {}", // Icon: keyboard
+ // Signal sent by Sway key binding (~/.config/sway/key-bindings)
+ "signal": 1, // SIGHUP
+ "tooltip": false
+ },
+
+"memory": {
"interval": 5,
"format": " {}%", // Icon: memory
"states": {
- "warning": 70,
- "critical": 90
+ "warning": 70,
+ "critical": 90
}
- },
-
- "network": {
- "interval": 5,
+},
+
+"network": {
+ "interval": 5,
"format-wifi": " {essid} ({signalStrength}%)", // Icon: wifi
"format-ethernet": " {ifname}: {ipaddr}/{cidr}", // Icon: ethernet
"format-disconnected": "⚠ Disconnected",
"tooltip-format": "{ifname}: {ipaddr}"
-
- },
-
- "sway/mode": {
- "format": " {}", // Icon: expand-arrows-alt
+},
+
+"sway/mode": {
+ "format": "{}",
"tooltip": false
- },
-
- "sway/window": {
+},
+
+"sway/window": {
"format": "{}",
"max-length": 120
- },
-
- "sway/workspaces": {
+},
+
+"sway/workspaces": {
"all-outputs": false,
"disable-scroll": true,
"format": "{icon} {name}",
"format-icons": {
- "1:www": "", // Icon: firefox-browser
- "2:mail": "", // Icon: mail
- "3:editor": "", // Icon: code
- "4:terminals": "", // Icon: terminal
- "5:portal": "", // Icon: terminal
- "urgent": "",
- "focused": "",
- "default": ""
+ "1:www": "", // Icon: firefox-browser
+ "2:mail": "", // Icon: mail
+ "3:editor": "", // Icon: code
+ "4:terminals": "", // Icon: terminal
+ "5:portal": "", // Icon: terminal
+ "urgent": "",
+ "focused": "",
+ "default": ""
}
- },
- "pulseaudio": {
- "scroll-step": 1, // %, can be a float
- "format": "{volume}% {icon}",
- "format-bluetooth": "{volume}% {icon} {format_source}",
- "format-bluetooth-muted": " {icon} {format_source}",
- "format-muted": " {format_source}",
- "format-source": "{volume}% ",
- "format-source-muted": "",
- "format-icons": {
- "headphone": "",
- "hands-free": "וֹ",
- "headset": " ",
- "phone": "",
- "portable": "",
- "car": "",
- "default": ["奄"]
- },
- "on-click": "pavucontrol",
- "on-scroll-up": "pamixer -ui 2",
- "on-scroll-down": "pamixer -ud 2",
- },
-
- "custom/weather": {
- "exec": "~/.config/waybar/scripts/weather.sh",
- "format": "{}",
- "return-type": "json",
- "interval": 600
- },
-
- "tray": {
- "icon-size": 21,
- "spacing": 10
- },
- "backlight": {
- "interval": 5,
- "format": "{icon} {percent}%",
- "format-alt": "{percent}% {icon}",
- "format-alt-click": "click-right",
- "format-icons": ["🌕", "🌔", "🌓", "🌒", "🌑"],
- "on-scroll-down": "brightnessctl -c backlight set +5%",
- "on-scroll-up": "brightnessctl -c backlight set 5%-"
- },
- "custom/firefox": {
- "format": " ",
- "on-click": "exec firefox",
- "tooltip": false
- },
- "custom/terminal": {
- "format": " ",
- "on-click": "exec alacritty",
- "tooltip": false
- },
- "custom/files": {
- "format": " ",
- "on-click": "exec thunar",
- "tooltip": false
- },
- "custom/seperator": {
- "format": " ",
-
- },
- "custom/launcher": {
- "format":"",
- "on-click": "exec wofi -c ~/.config/wofi/config -I",
- "tooltip": false
- },
- "custom/power": {
- "format":"",
- "on-click": "exec ~/.config/waybar/scripts/power-menu.sh",
- "tooltip": false
- },
+},
+
+"pulseaudio": {
+ "scroll-step": 1, // %, can be a float
+ "format": "{volume}% {icon}",
+ "format-bluetooth": "{volume}% {icon} {format_source}",
+ "format-bluetooth-muted": " {icon} {format_source}",
+ "format-muted": " {format_source}",
+ "format-source": "{volume}% ",
+ "format-source-muted": "",
+ "format-icons": {
+ "headphone": "",
+ "hands-free": "וֹ",
+ "headset": " ",
+ "phone": "",
+ "portable": "",
+ "car": "",
+ "default": ["奄"]
+ },
+ "on-click": "pavucontrol",
+ "on-scroll-up": "pamixer -ui 2",
+ "on-scroll-down": "pamixer -ud 2",
+},
+
+"custom/weather": {
+ "exec": "~/.config/waybar/scripts/weather.sh",
+ "format": "{}",
+ "return-type": "json",
+ "interval": 600
+},
+
+"tray": {
+ "icon-size": 18,
+ },
+
+"backlight": {
+ "interval": 5,
+ "format": "{icon} {percent}%",
+ "format-alt": "{percent}% {icon}",
+ "format-alt-click": "click-right",
+ "format-icons": ["🌕", "🌔", "🌓", "🌒", "🌑"],
+ "on-scroll-down": "brightnessctl -c backlight set +5%",
+ "on-scroll-up": "brightnessctl -c backlight set 5%-"
+},
+
+"custom/firefox": {
+ "format": " ",
+ "on-click": "exec firefox",
+ "tooltip": false
+},
+
+"custom/terminal": {
+ "format": " ",
+ "on-click": "exec alacritty",
+ "tooltip": false
+},
+
+"custom/files": {
+ "format": " ",
+ "on-click": "exec thunar",
+ "tooltip": false
+},
+
+"custom/launcher": {
+ "format":" ",
+ "on-click": "exec wofi -c ~/.config/wofi/config -I",
+ "tooltip": false,
+},
+
+"custom/power": {
+ "format":"",
+ "on-click": "exec ~/.config/waybar/scripts/power-menu.sh",
+ "tooltip": false,
+ },
}
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 43fd0f8..1dae294 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -5,271 +5,164 @@
* Configuration reference: https://github.com/Alexays/Waybar/wiki/Configuration
*
* =========================================================================== */
-
+
/* -----------------------------------------------------------------------------
* Keyframes
* -------------------------------------------------------------------------- */
-
+
@keyframes blink-warning {
70% {
color: white;
}
-
+
to {
color: white;
background-color: orange;
}
}
-
+
@keyframes blink-critical {
70% {
color: white;
}
-
+
to {
color: white;
background-color: red;
}
}
-
-
+
+
/* -----------------------------------------------------------------------------
* Base styles
* -------------------------------------------------------------------------- */
-
+
/* Reset all styles */
* {
- border: none;
+ border: none;
border-radius: 0;
- min-height: 0;
- margin: 0;
- padding: 0;
+ margin: 0px;
+ padding-top: 1px;
+ padding-bottom: 1px;
+ padding-left: 15;
+ padding-right: 15;
}
-
+
/* The whole bar */
#waybar {
- background: #000000;
+ background: black;
color: white;
font-family: UbuntuMono;
- font-size: 13px;
+ font-size: 14px;
}
-
-/* Each module */
-#battery,
-#clock,
-#cpu,
-#backlight
-#custom-keyboard-layout,
-#memory,
-#mode,
-#network,
-#pulseaudio,
-#custom-weather,
-#temperature,
-#tray {
- padding-left: 10px;
- padding-right: 10px;
- margin-right: 2px;
- margin-top: 4px;
- margin-bottom:4px;
- margin-left: 2px;
-}
-
-
+
+
/* -----------------------------------------------------------------------------
* Module styles
* -------------------------------------------------------------------------- */
-
+
#battery {
- animation-timing-function: linear;
- animation-iteration-count: infinite;
- animation-direction: alternate;
-/*
- background-color: #545157;
-*/
- margin-right: 8px;
- margin-left: 8px;
- font-size: 13px;
+ animation-timing-function: linear;
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
}
-
+
#battery.warning {
- color: orange;
+ color: orange;
}
-
+
#battery.critical {
- color: red;
+ color: red;
}
-
+
#battery.warning.discharging {
- animation-name: blink-warning;
- animation-duration: 3s;
+ animation-name: blink-warning;
+ animation-duration: 3s;
}
-
+
#battery.critical.discharging {
- animation-name: blink-critical;
- animation-duration: 2s;
+ animation-name: blink-critical;
+ animation-duration: 2s;
}
-
-#clock{
- font-size: 13px;
-}
-
-
-#cpu {
-/*
- no styles
-*/
-}
-
+
#cpu.warning {
- color: orange;
+ color: orange;
}
-
+
#cpu.critical {
- color: red;
+ color: red;
}
-
+
#memory {
- animation-timing-function: linear;
- animation-iteration-count: infinite;
- animation-direction: alternate;
+ animation-timing-function: linear;
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
}
-
+
#memory.warning {
- color: orange;
-}
-
+ color: orange;
+ }
+
#memory.critical {
color: red;
- animation-name: blink-critical;
- animation-duration: 2s;
+ animation-name: blink-critical;
+ animation-duration: 2s;
}
-
+
#mode {
- background: #64727D;
- border-top: 2px solid white;
- /* To compensate for the top border and still have vertical centering */
- padding-bottom: 2px;
-}
-
-#network {
-margin-left: 20px;
-
-}
-
+ background: red;
+ margin-top:2.5px;
+ margin-bottom:2.5px;
+ }
+
#network.disconnected {
- color: orange;
-}
-
-#pulseaudio {
- color: @base07;
-
- margin-right: 8px;
+ color: orange;
}
+
#pulseaudio.muted {
- color: @base07;
- margin-right: 8px;
-
+ color: @base07;
}
-
-#custom-spotify {
- color: rgb(102, 220, 105);
-}
-
-#temperature {
- /* No styles */
-}
-
+
#temperature.critical {
- color: red;
+ color: red;
}
-
-#tray {
- font-size: 17px;
- margin-right: 7px;
- margin-top: 4px;
- margin-bottom:4px;
- padding-left: 5px;
- padding-right: 5px;
- padding-top: 5px;
- padding-bottom: 5px;
-}
-
+
#window {
- font-weight: bold;
+ font-weight: bold;
}
-
+
#workspaces button {
- border-top: 2px solid transparent;
- /* To compensate for the top border and still have vertical centering */
- padding-bottom: 2px;
- padding-left: 10px;
- padding-right: 10px;
- color: #888888;
-}
-
+ color: #888888;
+ padding: 3px;
+ }
+
#workspaces button.focused {
- border-color: #4c7899;
- color: white;
- background-color: #285577;
+ border-color: #4c7899;
+ color: white;
+ background-color: #285577;
}
-
+
#workspaces button.urgent {
- border-color: #c9545d;
- color: #c9545d;
-}
-#custom-power {
-
- font-size: 18px;
- padding-left: 10px;
- padding-right: 10px;
- margin-top: 3px;
-
-}
-#backlight {
- margin-right:5px;
- color: #c4b729;
-
-}
-#custom-weather {
-/*
- no styles
-*/
+ border-color: #c9545d;
+ color: #c9545d;
}
+
#custom-firefox {
- font-size: 15px;
- color: #d08770;
+ color: #d08770;
}
#custom-files {
- color: #ebcb8b;
- font-size: 15px;
+ color: #ebcb8b;
}
-#custom-seperator {
- margin-left: 3px;
- margin-right: 3px;
- font-size: 20px;
-
-}
-#custom-keyboard-layout {
-/*
- no styles
-*/
-}
-#custom-launcher {
- color: #eceff4;
- font-size: 25px;
- margin-right: 7px;
- padding-left: 15px;
- padding-right: 15px;
- }
+
#custom-power {
- color: #eceff4;
- font-size: 17px;
- padding-left: 10px;
- padding-right: 10px;
-
+ font-size: 15px;
+ margin-right:1px;
+ padding:0;
}
-
-
-
+
+#custom-launcher {
+ font-size: 20px;
+ padding:0;
+ }
+