diff --git a/waybar/.config/config b/waybar/.config/config

deleted file mode 100644

index a0dbf954323246467bd8b22ad81fe5d93624cdeb..0000000000000000000000000000000000000000

--- a/waybar/.config/config

+++ /dev/null

@@ -1,168 +0,0 @@

-[{

- "layer": "top",

- "output": "eDP-1",

- "height": 20, // Waybar height (to be removed for auto height)

- "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],

- "modules-center": ["sway/window"],

- "modules-right": ["network", "battery", "battery#bat1", "clock"],

- "layer": "top",

- // Modules configuration

- "sway/mode": {

- "format": "<span style=\"italic\">{}</span>"

- },

- "clock": {

- // "timezone": "America/New_York",

- "tooltip-format": "<big>{:%Y %B %A}</big>\n<tt><small>{calendar}</small></tt>",

- "format-alt": "{:%Y-%m-%d}"

- },

- "backlight": {

- // "device": "acpi_video1",

- "format": "{percent}% {icon}",

- "format-icons": ["", ""]

- },

- "battery": {

- "states": {

- // "good": 95,

- "warning": 20,

- "critical": 10

- },

- "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": ["", "", "", "", ""]

- },

- "battery#bat1": {

- "bat": "BAT1",

- "states":{

- // "good": 95,

- "warning": 20,

- "critical": 10

- },

- "format": "{capacity}% {icon}",

- "format-charging": "{capacity}% ",

- "format-plugged": "{capacity}% ",

- "format-alt": "{time} {icon}",

- // "format-full": "",

- "format-icons": ["", "", "", "", ""]

- },

- "network": {

- // "interface": "wlp2*", // (Optional) To force the use of this interface

- "format-wifi": "{essid} ({signalStrength}%) ",

- "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",

- "format-linked": "{ifname} (No IP) ",

- "format-disconnected": "Disconnected ⚠",

- "format-alt": "{ifname}: {ipaddr}/{cidr}"

- },

-}, {

- "layer": "top",

- "output": "DP-6",

- "height": 20, // Waybar height (to be removed for auto height)

- "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],

- "modules-center": ["sway/window"],

- "modules-right": ["network","pulseaudio", "cpu", "memory", "battery", "battery#bat1", "clock"],

- "layer": "top",

- // Modules configuration

- "sway/mode": {

- "format": "<span style=\"italic\">{}</span>"

- },

- "tray": {

- // "icon-size": 21,

- "spacing": 10

- },

- "clock": {

- // "timezone": "America/New_York",

- "tooltip-format": "<big>{:%Y %B %A}</big>\n<tt><small>{calendar}</small></tt>",

- "format-alt": "{:%Y-%m-%d}"

- },

- "cpu": {

- "states": {

- "critical": 90

- },

- "format": "{usage}% ",

- "tooltip": true,

- "on-click": "/home/michal/.local/bin/floating alacritty -e gotop"

- },

- "memory": {

- "format": "{}% ",

- "on-click": "/home/michal/.local/bin/floating alacritty -e gotop"

-

- },

- "temperature": {

- // "thermal-zone": 2,

- // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",

- "critical-threshold": 80,

- // "format-critical": "{temperatureC}°C {icon}",

- "format": "{temperatureC}°C {icon}",

- "format-icons": ["", "", ""]

- },

- "backlight": {

- "format": "{percent}% {icon}",

- "format-icons": ["", ""]

- },

- "battery": {

- "states": {

- "warning": 20,

- "critical": 10

- },

- "format": "{capacity}% {icon}",

- "format-charging": "{capacity}% ",

- "format-plugged": "{capacity}% ",

- "format-alt": "{time} {icon}",

- "format-icons": ["", "", "", "", ""]

- },

- "battery#bat1": {

- "bat": "BAT1",

- "states":{

- "warning": 20,

- "critical": 10

- },

- "format": "{capacity}% {icon}",

- "format-charging": "{capacity}% ",

- "format-plugged": "{capacity}% ",

- "format-alt": "{time} {icon}",

- "format-icons": ["", "", "", "", ""]

- },

-

- "network": {

- // "interface": "wlp2*", // (Optional) To force the use of this interface

- "format-wifi": "{essid} ({signalStrength}%) ",

- "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",

- "format-linked": "{ifname} (No IP) ",

- "format-disconnected": "Disconnected ⚠",

- "format-alt": "{ifname}: {ipaddr}/{cidr}"

- },

- "pulseaudio": {

- "scroll-step": 1, // %, can be a float

- "format": "{volume}% {icon} {format_source}",

- "format-bluetooth": "{volume}% {icon} {format_source}",

- "format-bluetooth-muted": " {icon} {format_source}",

- "format-muted": " {format_source}",

- "format-source": "",

- "format-source-muted": "",

- "format-icons": {

- "headphone": "",

- "hands-free": "",

- "headset": "",

- "phone": "",

- "portable": "",

- "car": "",

- "default": ["", "", ""]

- },

- "on-click": "/home/michal/.local/bin/floating alacritty -e ncpamixer"

- },

- "custom/media": {

- "format": "{icon} {}",

- "return-type": "json",

- "max-length": 40,

- "format-icons": {

- "spotify": "",

- "default": "🎜"

- },

- "escape": true,

- "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder

- // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name

- }

-}]

diff --git a/waybar/.config/style.css b/waybar/.config/style.css

deleted file mode 100644

index d3b15485b8ee633d47498d3e416d125e66fcfb10..0000000000000000000000000000000000000000

--- a/waybar/.config/style.css

+++ /dev/null

@@ -1,235 +0,0 @@

-* {

- border: none;

- border-radius: 0;

- /* `otf-font-awesome` is required to be installed for icons */

- font-family: hack;

- font-size: 12px;

- min-height: 0;

-}

-

-window#waybar {

- background-color: rgba(22, 22, 22, 0.8);

- border-bottom: 0px solid rgba(100, 114, 125, 0.5);

- color: #ffffff;

- transition-property: background-color;

- transition-duration: .5s;

-}

-

-window#waybar.hidden {

- opacity: 0.2;

-}

-

-/*

-window#waybar.empty {

- background-color: transparent;

-}

-window#waybar.solo {

- background-color: #FFFFFF;

-}

-*/

-

-window#waybar.termite {

- background-color: #3F3F3F;

-}

-

-window#waybar.chromium {

- background-color: #000000;

- border: none;

-}

-

-#workspaces button {

- padding: 0 10px;

- background-color: transparent;

- color: #ffffff;

- /* Use box-shadow instead of border so the text isn't offset */

- box-shadow: inset 0 -3px transparent;

-}

-

-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */

-#workspaces button:hover {

- background: rgba(0, 0, 0, 0.2);

- box-shadow: inset 0 -2px #ffffff;

-}

-

-#workspaces button.focused {

- background-color: #2f2f2f;

- box-shadow: inset 0 -2px #2f74b5;

-}

-

-#workspaces button.urgent {

- background-color: #2fb538;

-}

-

-#mode {

- background-color: #64727D;

- border-bottom: 3px solid #ffffff;

-}

-

-#clock,

-#battery,

-#cpu,

-#memory,

-#temperature,

-#backlight,

-#network,

-#pulseaudio,

-#custom-media,

-#tray,

-#mode,

-#idle_inhibitor,

-#mpd {

- padding: 0 10px;

- margin: 0 4px;

- color: #ffffff;

-}

-

-#window,

-#workspaces {

- margin: 0 4px;

-}

-

-/* If workspaces is the leftmost module, omit left margin */

-.modules-left > widget:first-child > #workspaces {

- margin-left: 0;

-}

-

-/* If workspaces is the rightmost module, omit right margin */

-.modules-right > widget:last-child > #workspaces {

- margin-right: 0;

-}

-

-#date {

- background-color: #0a6cf5;

- color: #000000

-}

-

-#clock {

- background-color: #0a6cf5;

- color: #ffffff

-}

-

-#battery {

- background-color: #2bc238;

- color: #ffffff;

-}

-

-#battery.charging {

- color: #ffffff;

- background-color: #f59042;

-}

-

-@keyframes blink {

- to {

- background-color: #ffffff;

- color: #000000;

- }

-}

-

-#battery.critical:not(.charging) {

- background-color: #f53c3c;

- color: #bbbbbb;

- animation-name: blink;

- animation-duration: 0.5s;

- animation-timing-function: linear;

- animation-iteration-count: infinite;

- animation-direction: alternate;

-}

-

-label:focus {

- background-color: #000000;

-}

-

-#cpu {

- background-color: #2ecc71;

- color: #ffffff;

-}

-#cpu.critical {

- background-color: #f53c3c;

- color: #ffffff;

-}

-#memory {

- background-color: #9b59b6;

- color: #ffffff

-}

-

-#backlight {

- background-color: #90b1b1;

-}

-

-#network {

- background-color: #9f78e1;

-}

-

-#network.disconnected {

- background-color: #f53c3c;

-}

-

-#pulseaudio {

- background-color: #d9760d;

- color: #ffffff;

-}

-

-#pulseaudio.muted {

- background-color: #2f2f2f;

- color: #ffffff;

-}

-

-#custom-media {

- background-color: #66cc99;

- color: #2a5c45;

- min-width: 100px;

-}

-

-#custom-media.custom-spotify {

- background-color: #66cc99;

-}

-

-#custom-media.custom-vlc {

- background-color: #ffa000;

-}

-

-#temperature {

- background-color: #f0932b;

-}

-

-#temperature.critical {

- background-color: #eb4d4b;

-}

-

-#tray {

- background-color: #2980b9;

-}

-

-#idle_inhibitor {

- background-color: #2d3436;

-}

-

-#idle_inhibitor.activated {

- background-color: #ecf0f1;

- color: #2d3436;

-}

-

-#mpd {

- background-color: #66cc99;

- color: #2a5c45;

-}

-

-#mpd.disconnected {

- background-color: #f53c3c;

-}

-

-#mpd.stopped {

- background-color: #90b1b1;

-}

-

-#mpd.paused {

- background-color: #51a37a;

-}

-

-#language {

- background: #00b093;

- color: #740864;

- padding: 0 5px;

- margin: 0 5px;

- min-width: 16px;

-}

diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config

index 552f2a59024044f80ba1ea6b7a8ac7dc3f890dd1..a0dbf954323246467bd8b22ad81fe5d93624cdeb 100644

--- a/waybar/.config/waybar/config

+++ b/waybar/.config/waybar/config

@@ -1,8 +1,69 @@

-{

+[{

+ "layer": "top",

+ "output": "eDP-1",

"height": 20, // Waybar height (to be removed for auto height)

"modules-left": ["sway/workspaces", "sway/mode", "custom/media"],

"modules-center": ["sway/window"],

"modules-right": ["network", "battery", "battery#bat1", "clock"],

+ "layer": "top",

+ // Modules configuration

+ "sway/mode": {

+ "format": "<span style=\"italic\">{}</span>"

+ },

+ "clock": {

+ // "timezone": "America/New_York",

+ "tooltip-format": "<big>{:%Y %B %A}</big>\n<tt><small>{calendar}</small></tt>",

+ "format-alt": "{:%Y-%m-%d}"

+ },

+ "backlight": {

+ // "device": "acpi_video1",

+ "format": "{percent}% {icon}",

+ "format-icons": ["", ""]

+ },

+ "battery": {

+ "states": {

+ // "good": 95,

+ "warning": 20,

+ "critical": 10

+ },

+ "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": ["", "", "", "", ""]

+ },

+ "battery#bat1": {

+ "bat": "BAT1",

+ "states":{

+ // "good": 95,

+ "warning": 20,

+ "critical": 10

+ },

+ "format": "{capacity}% {icon}",

+ "format-charging": "{capacity}% ",

+ "format-plugged": "{capacity}% ",

+ "format-alt": "{time} {icon}",

+ // "format-full": "",

+ "format-icons": ["", "", "", "", ""]

+ },

+ "network": {

+ // "interface": "wlp2*", // (Optional) To force the use of this interface

+ "format-wifi": "{essid} ({signalStrength}%) ",

+ "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",

+ "format-linked": "{ifname} (No IP) ",

+ "format-disconnected": "Disconnected ⚠",

+ "format-alt": "{ifname}: {ipaddr}/{cidr}"

+ },

+}, {

+ "layer": "top",

+ "output": "DP-6",

+ "height": 20, // Waybar height (to be removed for auto height)

+ "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],

+ "modules-center": ["sway/window"],

+ "modules-right": ["network","pulseaudio", "cpu", "memory", "battery", "battery#bat1", "clock"],

+ "layer": "top",

// Modules configuration

"sway/mode": {

"format": "<span style=\"italic\">{}</span>"

@@ -13,15 +74,21 @@ "spacing": 10

},

"clock": {

// "timezone": "America/New_York",

- "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",

+ "tooltip-format": "<big>{:%Y %B %A}</big>\n<tt><small>{calendar}</small></tt>",

"format-alt": "{:%Y-%m-%d}"

},

"cpu": {

+ "states": {

+ "critical": 90

+ },

"format": "{usage}% ",

- "tooltip": false

+ "tooltip": true,

+ "on-click": "/home/michal/.local/bin/floating alacritty -e gotop"

},

"memory": {

- "format": "{}% "

+ "format": "{}% ",

+ "on-click": "/home/michal/.local/bin/floating alacritty -e gotop"

+

},

"temperature": {

// "thermal-zone": 2,

@@ -32,13 +99,11 @@ "format": "{temperatureC}°C {icon}",

"format-icons": ["", "", ""]

},

"backlight": {

- // "device": "acpi_video1",

"format": "{percent}% {icon}",

"format-icons": ["", ""]

},

"battery": {

"states": {

- // "good": 95,

"warning": 20,

"critical": 10

},

@@ -46,14 +111,11 @@ "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": ["", "", "", "", ""]

},

"battery#bat1": {

"bat": "BAT1",

"states":{

- // "good": 95,

"warning": 20,

"critical": 10

},

@@ -61,8 +123,6 @@ "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": ["", "", "", "", ""]

},

@@ -75,23 +135,23 @@ "format-disconnected": "Disconnected ⚠",

"format-alt": "{ifname}: {ipaddr}/{cidr}"

},

"pulseaudio": {

- // "scroll-step": 1, // %, can be a float

+ "scroll-step": 1, // %, can be a float

"format": "{volume}% {icon} {format_source}",

"format-bluetooth": "{volume}% {icon} {format_source}",

"format-bluetooth-muted": " {icon} {format_source}",

"format-muted": " {format_source}",

- "format-source": "{volume}% ",

+ "format-source": "",

"format-source-muted": "",

"format-icons": {

"headphone": "",

"hands-free": "",

"headset": "",

"phone": "",

- "portable": "",

+ "portable": "",

"car": "",

"default": ["", "", ""]

},

- "on-click": "pavucontrol"

+ "on-click": "/home/michal/.local/bin/floating alacritty -e ncpamixer"

},

"custom/media": {

"format": "{icon} {}",

@@ -105,4 +165,4 @@ "escape": true,

"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder

// "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name

}

-}

+}]

diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css

index d7e9b857178b95bdd46b32912390193d786a2039..d3b15485b8ee633d47498d3e416d125e66fcfb10 100644

--- a/waybar/.config/waybar/style.css

+++ b/waybar/.config/waybar/style.css

@@ -100,11 +100,12 @@ }

#date {

background-color: #0a6cf5;

- color: #ffffff

+ color: #000000

}

#clock {

background-color: #0a6cf5;

+ color: #ffffff

}

#battery {

@@ -140,11 +141,15 @@ }

#cpu {

background-color: #2ecc71;

- color: #000000;

+ color: #ffffff;

+}

+#cpu.critical {

+ background-color: #f53c3c;

+ color: #ffffff;

}

-

#memory {

background-color: #9b59b6;

+ color: #ffffff

}

#backlight {

@@ -160,13 +165,13 @@ background-color: #f53c3c;

}

#pulseaudio {

- background-color: #f1c40f;

- color: #000000;

+ background-color: #d9760d;

+ color: #ffffff;

}

#pulseaudio.muted {

- background-color: #90b1b1;

- color: #2a5c45;

+ background-color: #2f2f2f;

+ color: #ffffff;

}

#custom-media {