Re-arrange waybar, add style

3 files changed, 181 insertions, 3 deletions

diff --git a/homes/floppydisk/default.nix b/homes/floppydisk/default.nix
index 0522ae0..25d41bf 100644
--- a/homes/floppydisk/default.nix
+++ b/homes/floppydisk/default.nix
@@ -218,6 +218,7 @@
   programs.waybar = {
     enable = true;
     settings = import ./waybar.nix;
+    style = import ./waybar-style.nix;
   };
 
   # Nicely reload system units when changing configs
diff --git a/homes/floppydisk/waybar-style.nix b/homes/floppydisk/waybar-style.nix
new file mode 100644
index 0000000..89a3d85
--- /dev/null
+++ b/homes/floppydisk/waybar-style.nix
@@ -0,0 +1,177 @@
+''
+  * {
+    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;
+  }
+''
\ No newline at end of file
diff --git a/homes/floppydisk/waybar.nix b/homes/floppydisk/waybar.nix
index 652a1b0..cf04415 100644
--- a/homes/floppydisk/waybar.nix
+++ b/homes/floppydisk/waybar.nix
@@ -21,10 +21,10 @@
       "custom/sep_r"
       "cpu"
       "custom/sep_r"
-      "disk"
-      "custom/sep_r"
       "memory"
       "custom/sep_r"
+      "disk"
+      "custom/sep_r"
       "pulseaudio"
       "custom/sep_r"
       "network"
@@ -137,7 +137,7 @@
     };
 
     "memory" = {
-      format = " {}";
+      format = " {}%";
     };
 
     "battery" = {