Update waybar config

3 files changed, 163 insertions, 207 deletions

diff --git a/.github/README.md b/.github/README.md
index 66a90dd..e2f115a 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -26,4 +26,5 @@ Here are some details about my setup:
 If you have any questions or issues, open an issue under this repository. If you have any suggestions for improvement, head to the "Pull Requests" section and make your changes. If you think this repository is confusing, you are (mostly) right. Feel free to open an issue and ask why something is the way it is.
 
 ## Credits
-- **[NotAShelf](https://github.com/NotAShelf)** - Introduced me to NixOS, pretty much the reason this repo exists
\ No newline at end of file
+- **[NotAShelf](https://github.com/NotAShelf)** - Introduced me to NixOS, pretty much the reason this repo exists
+- **[toger5](https://github.com/toger5)** - My waybar stylesheet is a ~~stolen~~ modified version of [theirs](https://gist.github.com/toger5/3a509d9a9d7ebba1e02205b00449ccff#file-style-css)
\ No newline at end of file
diff --git a/homes/floppydisk/waybar-style.nix b/homes/floppydisk/waybar-style.nix
index 89a3d85..83e7de5 100644
--- a/homes/floppydisk/waybar-style.nix
+++ b/homes/floppydisk/waybar-style.nix
@@ -1,177 +1,153 @@
 ''
-  * {
-    border: none;
-    font-family: "JetbrainsMono Nerd Font" ;
-    font-size: 14px;
-    color: #eeeeee; 
-    border-radius: 12px; /* Controls Rounding */
-  }
-
-  #window {
-    /*font-weight: bold;*/
-    margin-top: 2px;
-    padding-left: 10px;
-    padding-right: 10px;
-    padding-bottom: 2px;
-    border-radius: 8px;
-    transition: none;
-
-    }
-
-  window#waybar {
-    background: #060606;
-    padding: 2px 2px 2px 0px;
-    /* background: transparent; */
-  }
-
-  window#waybar.empty {
-    animation: fadeIn 5s;
-  }
-
-  window#waybar.hidden {
-    opacity: 0.2;
-    }
-
-  /*-----module groups----*/
-  .modules-right {
-    /* margin: 0 -12px 0 0; */
-    padding-right:7px;
-    margin: 4px;
-  }
-
-  .mnodules-center {
-    /* background: transparent; */
-    margin: 0 0 0 0;
-
-  }
-
-  .modules-left {
-    /* margin: 0 -12px 0 0; */
-    padding-left:7px;
-  }
-
-  tooltip {
-    background: #060606;
-    color: #ffffff;
-    border-radius: 10;
-  }
-
-  #workspaces {
-    padding-right: 0px;
-  }
-
-  /*-----modules indv----*/
-  #workspaces button {
-    font-weight: bold;
-    padding-right: 0px;
-    /* padding-right: 7px */
-  }
-  #workspaces button:hover {
-    font-weight: bold;
-    padding-right: 0px;
-    /* padding-right: 7px */
-  }
-
-  #workspaces button.focused {
-    font-weight: bold;
-    padding-right: 0px;
-    /* padding-right: 7px */
-  }
-
-  #workspaces button.active {
-    font-weight: bold;
-    /* background-color: #ffffff; */
-    /* padding-right: 7px */
-  }
-
-  #custom-sep_l {
-  	color: #ffffff;
-        margin: 0px 10px 0px 10px;
-  }
-
-  #custom-sep_r {
-    color: #ffffff;
-    padding-left: 4px;
-    padding-right: 4px;
-  }
-
-  #custom-sep {
-    color: #ffffff;
-  }
-
-  #custom-empty {
-    color: #ffffff;
-  }
-
-  #clock {
-  	font-weight: bold;
-    padding: 0px 4px
-  }
-
-  #battery,
-  #cpu,
-  #memory,
-  #temperature,
-  #network,
-  #pulseaudio,
-  #custom-media,
-  #custom-updates {
-    padding: 0px 10px
-  }
-
-  #tray {
-    padding-left: 0px;
-    padding-right: 0px;
-  }
-
-
-  #keyboard-state {
-    padding-left: 0px;
-    padding-right: 0px;
-   }
-
-  #mode,
-  #custom-power,
-  #custom-launcher {
-    font-weight: bold;
-    /* padding-right: 7px */
-  }
-  #custom-menu {
-    font-weight: bold;
-    /* padding-right: 7px; */
-  }
-  #idle_inhibitor {
-    padding: 0 5px;
-  }
-
-  #mode {
-    color: #cc3436;
-    font-weight: bold;
-  }
-
-  /*-----Indicators----*/
-  #network.disconnected {
-  	color: #ff5454;
-  }
-  #network.disabled {
-  	color: #e3c78a;
-  }
-  #idle_inhibitor.activated {
-    color: #2dcc36;
-  }
-  #pulseaudio.muted {
-    color: #aaaaaa;
-  }
-  #battery.charging {
-    color: #8cc85f;
-  }
-  #battery.warning:not(.charging) {
-  	color: #e3c78a;
-  }
-  #battery.critical:not(.charging) {
-    color: #ff5454;
-  }
-  #temperature.critical {
-    color: #ff5454;
-  }
+* {
+  border: none;
+  border-radius: 0;
+  font-family: Roboto,'Font Awesome 5', 'SFNS Display',  Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  min-height: 0;
+}
+
+window#waybar {
+  background: rgba(43, 48, 59, 0.5);
+  border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+  color: #1e2030;
+}
+
+window#waybar.hidden {
+  opacity: 0.0;
+}
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+#workspaces button {
+  padding: 0 5px;
+  background: transparent;
+  color: #cad3f5;
+  border-bottom: 3px solid transparent;
+}
+
+#workspaces button.focused {
+  background: #64727D;
+  border-bottom: 3px solid #cad3f5;
+}
+
+#workspaces button.urgent {
+  background-color: #eb4d4b;
+}
+
+#mode {
+  background: #64727D;
+  border-bottom: 3px solid #cad3f5;
+}
+
+#custom-notification, #workspaces, #disk, #clock, #battery, #cpu, #memory, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor {
+  padding: 0 10px;
+  margin: 0 2px;
+}
+
+#workspaces {
+  background-color: #494d64;
+}
+
+#clock {
+  background-color: #64727D;
+}
+
+#battery {
+  background-color: #cad3f5;
+}
+
+#battery.charging {
+  color: #cad3f5;
+  background-color: #26A65B;
+}
+
+@keyframes blink {
+  to {
+    background-color: #cad3f5;
+  }
+}
+
+#battery.critical:not(.charging) {
+  background: #f53c3c;
+  color: #cad3f5;
+  animation-name: blink;
+  animation-duration: 0.5s;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+}
+
+#cpu {
+  background: #a6da95;
+}
+
+#memory {
+  background: #c6a0f6;
+}
+
+#backlight {
+  background: #90b1b1;
+}
+
+#network {
+  background: #f5a97f;
+}
+
+#disk {
+  background: #2980b9;
+  color: #cad3f5;
+}
+
+
+#network.disconnected {
+  background: #f53c3c;
+}
+
+#pulseaudio {
+  background: #eed49f;
+  color: #000000;
+}
+
+#pulseaudio.muted {
+  background: #90b1b1;
+  color: #2a5c45;
+}
+
+#custom-media {
+  background: #66cc99;
+  color: #2a5c45;
+}
+
+.custom-spotify {
+  background: #66cc99;
+}
+
+.custom-vlc {
+  background: #ffa000;
+}
+
+#temperature {
+  background: #f0932b;
+}
+
+#temperature.critical {
+  background: #eb4d4b;
+}
+
+#tray {
+  background-color: #2980b9;
+}
+
+#idle_inhibitor {
+  background-color: #2d3436;
+}
+
+#idle_inhibitor.activated {
+  background-color: #ecf0f1;
+  color: #2d3436;
+}
+
+#custom-notification {
+  color: #1e2030;
+  background-color: #8bd5ca;
+}
 ''
\ No newline at end of file
diff --git a/homes/floppydisk/waybar.nix b/homes/floppydisk/waybar.nix
index cf04415..281959b 100644
--- a/homes/floppydisk/waybar.nix
+++ b/homes/floppydisk/waybar.nix
@@ -3,33 +3,22 @@
     layer = "top";
     position = "top";
     height = 27;
-    margin = "7";
     fixed-center = true;
     modules-left = [
-      "wlr/workspaces"
+      "custom/notification"
       "custom/sep"
       "tray"
-      "custom/updates"
     ];
     modules-center = [
-      "clock"
-      "sep"
-      "custom/notification"
+      "wlr/workspaces"
     ];
     modules-right = [
       "battery"
-      "custom/sep_r"
       "cpu"
-      "custom/sep_r"
       "memory"
-      "custom/sep_r"
-      "disk"
-      "custom/sep_r"
       "pulseaudio"
-      "custom/sep_r"
       "network"
-      "custom/sep_r"
-      "custom/launcher"
+      "clock"
     ];
 
     "custon/sep_r" = {
@@ -66,7 +55,7 @@
       disable-scroll = false;
       all-outputs = true;
       format = "{icon}";
-      active-only = true;
+      active-only = false;
       format-icons = {
         "1" = "I";
         "2" = "II";
@@ -119,9 +108,9 @@
 
     "clock" = {
       timezone = "Europe/London";
-      format = "{: %H:%M}";
-      format-alt = "{: %H:%M   %d/%m/%Y}";
-      tooltip-format = "{: %H:%M   %d/%m/%Y}";
+      format = "{:  %H:%M}";
+      format-alt = "{:  %H:%M    %d/%m/%Y}";
+      tooltip-format = "{:  %H:%M    %d/%m/%Y}";
       today-format = "<span color='#aaaaaa'><b><u>{}</u></b></span>";
       calendar-weeks-pos = "right";
       format-calendar = "<span color='#aaaaaa'><b><u>{}</u></b></span>";
@@ -166,19 +155,8 @@
 
     "pulseaudio" = {
       on-click = "pavucontrol";
-      format = "{icon}{volume}%  {format_source}";
-      format-bluetooth = "{icon}{volume}%  {format_source}";
-      format-bluetooth-muted = "{icon}  {format_source}";
-      format-muted = " {format_source}";
-      format-source = " {volume}%";
-      format-source-muted = " ";
+      format = "{icon}{volume}%";
       format-icons = {
-        "headphone" = "";
-        "hands-free" = "";
-        "headset" = "";
-        "phone" = "";
-        "portable" = "";
-        "car" = "";
         "default" = [" " " " " "];
       };
     };
@@ -195,4 +173,5 @@
       on-click = "wlogout";
     };
   };
-}
\ No newline at end of file
+}
+