whoops

8 files changed, 65 insertions, 781 deletions

diff --git a/.config/waybar/waybar/config b/.config/waybar/waybar/config
deleted file mode 120000
index eed1e84..0000000
--- a/.config/waybar/waybar/config
+++ /dev/null
@@ -1 +0,0 @@
-yoink/config
\ No newline at end of file
diff --git a/.config/waybar/waybar/default/config b/.config/waybar/waybar/default/config
deleted file mode 100644
index ad76e93..0000000
--- a/.config/waybar/waybar/default/config
+++ /dev/null
@@ -1,166 +0,0 @@
-{
-    // "layer": "top", // Waybar at top layer
-    // "position": "bottom", // Waybar position (top|bottom|left|right)
-    "height": 30, // Waybar height (to be removed for auto height)
-    // "width": 1280, // Waybar width
-    "spacing": 4, // Gaps between modules (4px)
-    // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad", "custom/media"],
-    "modules-center": ["sway/window"],
-    "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "battery#bat2", "clock", "tray"],
-    // Modules configuration
-    // "sway/workspaces": {
-    //     "disable-scroll": true,
-    //     "all-outputs": true,
-    //     "format": "{name}: {icon}",
-    //     "format-icons": {
-    //         "1": "",
-    //         "2": "",
-    //         "3": "",
-    //         "4": "",
-    //         "5": "",
-    //         "urgent": "",
-    //         "focused": "",
-    //         "default": ""
-    //     }
-    // },
-    "keyboard-state": {
-        "numlock": true,
-        "capslock": true,
-        "format": "{name} {icon}",
-        "format-icons": {
-            "locked": "",
-            "unlocked": ""
-        }
-    },
-    "sway/mode": {
-        "format": "<span style=\"italic\">{}</span>"
-    },
-    "sway/scratchpad": {
-        "format": "{icon} {count}",
-        "show-empty": false,
-        "format-icons": ["", ""],
-        "tooltip": true,
-        "tooltip-format": "{app}: {title}"
-    },
-    "mpd": {
-        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
-        "format-disconnected": "Disconnected ",
-        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
-        "unknown-tag": "N/A",
-        "interval": 2,
-        "consume-icons": {
-            "on": " "
-        },
-        "random-icons": {
-            "off": "<span color=\"#f53c3c\"></span> ",
-            "on": " "
-        },
-        "repeat-icons": {
-            "on": " "
-        },
-        "single-icons": {
-            "on": "1 "
-        },
-        "state-icons": {
-            "paused": "",
-            "playing": ""
-        },
-        "tooltip-format": "MPD (connected)",
-        "tooltip-format-disconnected": "MPD (disconnected)"
-    },
-    "idle_inhibitor": {
-        "format": "{icon}",
-        "format-icons": {
-            "activated": "",
-            "deactivated": ""
-        }
-    },
-    "tray": {
-        // "icon-size": 21,
-        "spacing": 10
-    },
-    "clock": {
-        // "timezone": "America/New_York",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%Y-%m-%d}"
-    },
-    "cpu": {
-        "format": "{usage}% ",
-        "tooltip": false
-    },
-    "memory": {
-        "format": "{}% "
-    },
-    "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": {
-        // "device": "acpi_video1",
-        "format": "{percent}% {icon}",
-        "format-icons": ["", "", "", "", "", "", "", "", ""]
-    },
-    "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": ["", "", "", "", ""]
-    },
-    "battery#bat2": {
-        "bat": "BAT2"
-    },
-    "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ipaddr}/{cidr} ",
-        "tooltip-format": "{ifname} via {gwaddr} ",
-        "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": "{volume}% ",
-        "format-source-muted": "",
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "on-click": "pavucontrol"
-    },
-    "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/.config/waybar/waybar/default/style.css b/.config/waybar/waybar/default/style.css
deleted file mode 100644
index 86e8338..0000000
--- a/.config/waybar/waybar/default/style.css
+++ /dev/null
@@ -1,280 +0,0 @@
-* {
-    /* `otf-font-awesome` is required to be installed for icons */
-    font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
-    font-size: 13px;
-}
-
-window#waybar {
-    background-color: rgba(43, 48, 59, 0.0);
-    border-bottom: 3px 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;
-}
-
-button {
-    /* Use box-shadow instead of border so the text isn't offset */
-    box-shadow: inset 0 -3px transparent;
-    /* Avoid rounded borders under each button name */
-    border: none;
-    border-radius: 0;
-}
-
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-button:hover {
-    background: inherit;
-    box-shadow: inset 0 -3px #ffffff;
-}
-
-#workspaces button {
-    padding: 0 5px;
-    background-color: transparent;
-    color: #ffffff;
-}
-
-#workspaces button:hover {
-    background: rgba(0, 0, 0, 0.2);
-}
-
-#workspaces button.focused {
-    background-color: #64727D;
-    box-shadow: inset 0 -3px #ffffff;
-}
-
-#workspaces button.urgent {
-    background-color: #eb4d4b;
-}
-
-#mode {
-    background-color: #64727D;
-    border-bottom: 3px solid #ffffff;
-}
-
-#clock,
-#battery,
-#cpu,
-#memory,
-#disk,
-#temperature,
-#backlight,
-#network,
-#pulseaudio,
-#wireplumber,
-#custom-media,
-#tray,
-#mode,
-#idle_inhibitor,
-#scratchpad,
-#mpd {
-    padding: 0 10px;
-    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;
-}
-
-#clock {
-    background-color: #64727D;
-}
-
-#battery {
-    background-color: #ffffff;
-    color: #000000;
-}
-
-#battery.charging, #battery.plugged {
-    color: #ffffff;
-    background-color: #26A65B;
-}
-
-@keyframes blink {
-    to {
-        background-color: #ffffff;
-        color: #000000;
-    }
-}
-
-#battery.critical:not(.charging) {
-    background-color: #f53c3c;
-    color: #ffffff;
-    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: #000000;
-}
-
-#memory {
-    background-color: #9b59b6;
-}
-
-#disk {
-    background-color: #964B00;
-}
-
-#backlight {
-    background-color: #90b1b1;
-}
-
-#network {
-    background-color: #2980b9;
-}
-
-#network.disconnected {
-    background-color: #f53c3c;
-}
-
-#pulseaudio {
-    background-color: #f1c40f;
-    color: #000000;
-}
-
-#pulseaudio.muted {
-    background-color: #90b1b1;
-    color: #2a5c45;
-}
-
-#wireplumber {
-    background-color: #fff0f5;
-    color: #000000;
-}
-
-#wireplumber.muted {
-    background-color: #f53c3c;
-}
-
-#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;
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: #eb4d4b;
-}
-
-#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;
-}
-
-#keyboard-state {
-    background: #97e1ad;
-    color: #000000;
-    padding: 0 0px;
-    margin: 0 5px;
-    min-width: 16px;
-}
-
-#keyboard-state > label {
-    padding: 0 5px;
-}
-
-#keyboard-state > label.locked {
-    background: rgba(0, 0, 0, 0.2);
-}
-
-#scratchpad {
-    background: rgba(0, 0, 0, 0.2);
-}
-
-#scratchpad.empty {
-	background-color: transparent;
-}
diff --git a/.config/waybar/waybar/style.css b/.config/waybar/waybar/style.css
deleted file mode 120000
index 40b1c0d..0000000
--- a/.config/waybar/waybar/style.css
+++ /dev/null
@@ -1 +0,0 @@
-yoink/style.css
\ No newline at end of file
diff --git a/.config/waybar/waybar/yoink/config b/.config/waybar/waybar/yoink/config
deleted file mode 100644
index 9f8fd31..0000000
--- a/.config/waybar/waybar/yoink/config
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-    "modules-left": ["sway/workspaces", "sway/mode"],
-    "modules-center": ["sway/window", "cpu", "temperature", "memory","tray"],
-    "modules-right": ["pulseaudio",  "backlight", "battery", "clock"],
-    "sway/mode": {
-        "format": "<span style=\"italic\">{}</span>"
-    },
-    "position": "bottom", // Waybar position (top|bottom|left|right)
-    "network": {
-        "format-wifi": "({signalStrength}%) ",
-        "format-ethernet": "{ifname} ",
-        "format-disconnected": "",
-        "max-length": 50,
-        "on-click": "'"
-    },
-    "tray": {
-        "icon-size": 15,
-        "spacing": 10
-    },
-    "clock": {
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        // "format-alt": "{:%Y-%m-%d}"
-		"on-click": "gnome-calendar"
-    },
-    "pulseaudio": {
-        "format": "{volume}% {icon} ",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": "0% {icon} ",
-        "format-source": "{volume}% ",
-        "format-source-muted": "",
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "ignored-sinks": ["Easy Effects Sink"],
-        "on-click": "pavucontrol"
-    },
-    "cpu": {
-        "format": "{usage}% ",
-        "tooltip": true
-    },
-    "memory": {
-        "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": ["", "", "", "", ""]
-    },
-    "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": ["", "", ""]
-    },
-    "sway/window": {
-        "format": "{}",
-        "min-length": 25,
-        "max-length": 25,
-        "rewrite": {
-          "": "Out of Focus"
-        }
-    },
-    "backlight": {
-        "device": "intel_backlight",
-        "format": "{percent}% {icon}",
-        "format-icons": [""],
-        "on-scroll-up": "brightnessctl set +5%",
-        "on-scroll-down": "~/bin/decrement-brightness.sh"
-    }
-}
diff --git a/.config/waybar/waybar/yoink/style.css b/.config/waybar/waybar/yoink/style.css
deleted file mode 100644
index a6e6e14..0000000
--- a/.config/waybar/waybar/yoink/style.css
+++ /dev/null
@@ -1,161 +0,0 @@
-@define-color hover rgba(208, 240, 192, 0.6);
-@define-color text #d3b58d;
-@define-color background rgba(6, 38, 37, 0.95);
-@define-color highlight rgba(12, 76, 74, 1.0);
-
-* {
-  border: none;
-  font-family: Fira Mono, Font Awesome, Roboto, Arial, sans-serif;
-  font-size: 15px;
-}
-
-window#waybar {
-  background-color: @background;
-  color: @text;
-}
-
-/*-----module groups----*/
-.modules-right {
-  background-color: @background;
-  margin: 0;
-}
-.modules-center {
-  background-color: @background;
-  margin: 2px 5px 0 0;
-  padding-left: 10px;
-}
-.modules-left {
-  background-color: @background;
-  margin: 0;
-}
-/*-----modules indv----*/
-#workspaces button {
-  padding: 1px 5px;
-  background-color: transparent;
-}
-
-#workspaces button:hover {
-  box-shadow: inherit;
-  background-color: rgba(0,153,153,0.2);
-}
-
-#workspaces button.focused {
-  background-color: @highlight;
-}
-
-
-#workspaces button.urgent {
-  background-color: #eb4d4b;
-}
-
-
-#clock,
-#battery,
-#cpu,
-#memory,
-#temperature,
-#backlight,
-#network,
-#pulseaudio,
-#custom-media,
-#tray,
-#mode,
-#window
-#custom-power,
-#custom-menu,
-#idle_inhibitor {
-  padding: 0 10px;
-  color: @text;
-}
-#mode {
-  color: #cc3436;
-  font-weight: bold;
-}
-#custom-power {
-  margin: 5px 5px;
-  padding: 1px 1px 1px 6px;
-}
-/*-----Indicators----*/
-#idle_inhibitor.activated {
-  color: #2dcc36;
-}
-#pulseaudio.muted {
-  color: #cc3436;
-}
-
-#battery.charging, #battery.plugged {
-  color: #ffffff;
-  background-color: #26A65B;
-}
-
-#battery.warning:not(.charging) {
-  color: #0000ff;
-  background-color: #ffbf00;
-}
-
-@keyframes blink {
-  to {
-    background-color: #ffffff;
-    color: #000000;
-  }
-}
-
-#battery.critical:not(.charging) {
-  background-color: #f53c3c;
-  color: #ffffff;
-  animation-name: blink;
-  animation-duration: 1s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-  animation-direction: alternate;
-}
-
-#temperature.critical {
-  color: #cc3436;
-}
-
-#tray {
-  background-color: @highlight
-}
-
-#tray > .passive {
-  -gtk-icon-effect: dim;
-}
-
-#tray > .needs-attention {
-  -gtk-icon-effect: highlight;
-  background-color: #eb4d4b;
-}
-
-#battery {
-  padding-right: 20px;
-}
-
-button {
-  /* Use box-shadow instead of border so the text isn't offset */
-  box-shadow: inset 0 -3px transparent;
-  /* Avoid rounded borders under each button name */
-  border: none;
-  border-radius: 0;
-}
-
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-button:hover {
-  background: inherit;
-  box-shadow: inset 0 -3px #ffffff;
-}
-
-#workspaces button {
-  padding: 0 5px;
-  background-color: transparent;
-  color: @text;
-}
-
-
-/*-----Colors----*/
-/*
- *rgba(0,85,102,1),#005566 --> Indigo(dye)
- *rgba(0,43,51,1),#002B33 --> Dark Green
- *rgba(0,153,153,1),#009999 --> Persian Green
- *
- */
diff --git a/.config/waybar/yoink/config b/.config/waybar/yoink/config
index 3d2dce5..9f8fd31 100644
--- a/.config/waybar/yoink/config
+++ b/.config/waybar/yoink/config
@@ -5,11 +5,11 @@
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
-    "position": "top", // Waybar position (top|bottom|left|right)
+    "position": "bottom", // Waybar position (top|bottom|left|right)
     "network": {
         "format-wifi": "({signalStrength}%) ",
         "format-ethernet": "{ifname} ",
-        "format-disconnected": "", 
+        "format-disconnected": "",
         "max-length": 50,
         "on-click": "'"
     },
@@ -38,6 +38,7 @@
             "car": "",
             "default": ["", "", ""]
         },
+        "ignored-sinks": ["Easy Effects Sink"],
         "on-click": "pavucontrol"
     },
     "cpu": {
@@ -82,6 +83,6 @@
         "format": "{percent}% {icon}",
         "format-icons": [""],
         "on-scroll-up": "brightnessctl set +5%",
-        "on-scroll-down": "~/nushell/decrement-brightness.nu"
+        "on-scroll-down": "~/bin/decrement-brightness.sh"
     }
 }
diff --git a/.config/waybar/yoink/style.css b/.config/waybar/yoink/style.css
index 865f27d..c582e51 100644
--- a/.config/waybar/yoink/style.css
+++ b/.config/waybar/yoink/style.css
@@ -1,70 +1,51 @@
-/*
- * Tea green
- * https://en.wikipedia.org/wiki/Shades_of_green#Tea_green
- */
-@define-color highlight rgba(208, 240, 192, 0.4);
 @define-color hover rgba(208, 240, 192, 0.6);
+@define-color text #d3b58d;
+@define-color background rgba(6, 38, 37, 0.95);
+@define-color highlight rgba(12, 76, 74, 1.0);
 
 * {
-    border: none;
-    font-family: JetBrainsMono Nerd Font, Font Awesome, Roboto, Arial, sans-serif;
-    font-size: 13px;
-    border-radius: 5px;
+  border: none;
+  font-family: Fira Mono, Font Awesome, Roboto, Arial, sans-serif;
+  font-size: 15px;
 }
 
 window#waybar {
-    background-color: rgba(0,0,0, 0.0);
-    color: #ffffff;
+  background-color: @background;
+  color: @text;
 }
 
 /*-----module groups----*/
 .modules-right {
-	background-color: rgba(0,43,51,0.3);
-    margin: 2px 10px 0 0;
+  background-color: @background;
+  margin: 0;
 }
 .modules-center {
-	background-color: rgba(0,43,51,0.3);
-    margin: 2px 5px 0 0;
-    padding-left: 10px;
+  background-color: @background;
+  margin: 0;
+  padding-left: 10px;
 }
 .modules-left {
-    margin: 2px 0 0 5px;
-	background-color: rgba(0,43,51,0.3);
+  background-color: @background;
+  margin: 0;
 }
 /*-----modules indv----*/
 #workspaces button {
-    padding: 1px 5px;
-    background-color: transparent;
-    border-radius: 5px
-}
-/*
- * only curve first and last workspaces butons
-#workspaces button:first-child {
-    border-bottom-left-radius: 5px;
-    border-top-left-radius: 5px;
+  padding: 1px 5px;
+  background-color: transparent;
 }
-#workspaces button:last-child {
-    border-bottom-right-radius: 5px;
-    border-top-right-radius: 5px;
-}
-#workspaces button:only-child {
-    border-radius: 5px;
-}
-*/
-
 
 #workspaces button:hover {
-    box-shadow: inherit;
-	background-color: rgba(0,153,153,0.2);
+  box-shadow: inherit;
+  background-color: rgba(0,153,153,0.2);
 }
 
 #workspaces button.focused {
-	background-color: @highlight;
+  background-color: @highlight;
 }
 
 
 #workspaces button.urgent {
-    background-color: #eb4d4b;
+  background-color: #eb4d4b;
 }
 
 
@@ -83,49 +64,54 @@ window#waybar {
 #custom-power,
 #custom-menu,
 #idle_inhibitor {
-    padding: 0 10px;
-    color: #ffffff;
+  padding: 0 10px;
+  color: @text;
 }
 #mode {
-    color: #cc3436;
-    font-weight: bold;
+  color: #cc3436;
+  font-weight: bold;
 }
 #custom-power {
-    margin: 5px 5px;
-    padding: 1px 1px 1px 6px;
+  margin: 5px 5px;
+  padding: 1px 1px 1px 6px;
 }
 /*-----Indicators----*/
 #idle_inhibitor.activated {
-    color: #2dcc36;
+  color: #2dcc36;
 }
 #pulseaudio.muted {
-    color: #cc3436;
+  color: #cc3436;
 }
 
 #battery.charging, #battery.plugged {
-    color: #ffffff;
-    background-color: #26A65B;
+  color: #ffffff;
+  background-color: #26A65B;
+}
+
+#battery.warning:not(.charging) {
+  color: #0000ff;
+  background-color: #ffbf00;
 }
 
 @keyframes blink {
-    to {
-        background-color: #ffffff;
-        color: #000000;
-    }
+  to {
+    background-color: #ffffff;
+    color: #000000;
+  }
 }
 
 #battery.critical:not(.charging) {
-    background-color: #f53c3c;
-    color: #ffffff;
-    animation-name: blink;
-    animation-duration: 1s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+  background-color: #f53c3c;
+  color: #ffffff;
+  animation-name: blink;
+  animation-duration: 1s;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
 }
 
 #temperature.critical {
-    color: #cc3436;
+  color: #cc3436;
 }
 
 #tray {
@@ -133,42 +119,36 @@ window#waybar {
 }
 
 #tray > .passive {
-    -gtk-icon-effect: dim;
+  -gtk-icon-effect: dim;
 }
 
 #tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: #eb4d4b;
+  -gtk-icon-effect: highlight;
+  background-color: #eb4d4b;
 }
 
 #battery {
-  /*background-color: #FF8000;*/
   padding-right: 20px;
 }
 
-#clock {
-  background-color: @highlight;
-}
-
-
 button {
-    /* Use box-shadow instead of border so the text isn't offset */
-    box-shadow: inset 0 -3px transparent;
-    /* Avoid rounded borders under each button name */
-    border: none;
-    border-radius: 0;
+  /* Use box-shadow instead of border so the text isn't offset */
+  box-shadow: inset 0 -3px transparent;
+  /* Avoid rounded borders under each button name */
+  border: none;
+  border-radius: 0;
 }
 
 /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 button:hover {
-    background: inherit;
-    box-shadow: inset 0 -3px #ffffff;
+  background: inherit;
+  box-shadow: inset 0 -3px #ffffff;
 }
 
 #workspaces button {
-    padding: 0 5px;
-    background-color: transparent;
-    color: #ffffff;
+  padding: 0 5px;
+  background-color: transparent;
+  color: @text;
 }