home/base: improve waybar design

3 files changed, 18 insertions, 70 deletions

diff --git a/home/modules/profiles/base/config/waybar-settings.nix b/home/modules/profiles/base/config/waybar-settings.nix
index 8cb3ef9..d563c4c 100644
--- a/home/modules/profiles/base/config/waybar-settings.nix
+++ b/home/modules/profiles/base/config/waybar-settings.nix
@@ -1,10 +1,10 @@
 {
   layer = "bottom";
   position = "top";
-  height = 17;
-  modules-left = [ "sway/workspaces" "sway/language" "cpu" "memory" ];
+  height = 21;
+  modules-left = [ "sway/workspaces" ];
   modules-center = [ "clock" ];
-  modules-right = [ "custom/weather" "pulseaudio" "network" "custom/nixos" ];
+  modules-right = [ "cpu" "memory" "custom/weather" "pulseaudio" "network" ];
 
   modules = {
     "sway/workspaces" = {
@@ -24,13 +24,9 @@
       };
     };
 
-    "sway/language" = {
-      format = " {long}";
-    };
-
     "clock" = {
       interval = 10;
-      format = "{:  %m/%d/%Y %I:%M %p}";
+      format = "{:  %a %d %H:%M}";
     };
 
     "cpu" = {
@@ -44,11 +40,6 @@
       interval = 3600;
     };
 
-    "custom/nixos" = {
-      format = "  {}";
-      exec = "/run/current-system/sw/bin/nixos-version | /run/current-system/sw/bin/grep -o '[0-9]\\+\\.[0-9]\\+' | /run/current-system/sw/bin/head -1";
-    };
-
     "network" = {
       interval = 5;
       interface = "enp4s0";
@@ -67,7 +58,7 @@
 
     "memory" = {
       interval = 5;
-      format = " {used:0.1f}G / {total:0.1f}G ({percentage:3}%)";
+      format = " {used:0.2f}GiB";
     };
   };
 }
diff --git a/home/modules/profiles/base/config/waybar-style.nix b/home/modules/profiles/base/config/waybar-style.nix
index af22330..ae9041e 100644
--- a/home/modules/profiles/base/config/waybar-style.nix
+++ b/home/modules/profiles/base/config/waybar-style.nix
@@ -16,17 +16,21 @@
     padding: 0 4px;
     background: #84a0c6;
     color: #18191f;
-    border-bottom: 2px solid #84a0c6;
+    border-bottom: 3px solid rgba (255, 255, 255, .2);
   }
 
   #workspaces button.focused {
-    background: #84a0c6;
-    border-bottom: 2px solid #18191f;
+    background-color: #84a0c6;
+    border-bottom: 3px solid #18191f;
+  }
+
+  #workspaces button:hover {
+    box-shadow: inherit;
+    text-shadow: inherit;
   }
 
   #clock,
   #cpu,
-  #battery,
   #temperature,
   #backlight,
   #network,
@@ -36,12 +40,12 @@
   #tray,
   #mode,
   #mpd,
-  #custom-weather,
-  #custom-nixos {
-    padding: 0 6px;
-    margin: 0;
-    background-color: #84a0c6;
+  #custom-weather {
+    padding: 0 10px;
+    margin: 0 4px;
     color: #18191f;
+    background-color: #84a0c6;
+    border-bottom: 3px solid rgba (255, 255, 255, .2);
   }
 
   @keyframes blink {
@@ -50,49 +54,4 @@
       color: #18191f;
     }
   }
-
-  #cpu {
-    background-color: #a093c7;
-  }
-
-  #network {
-    background-color: #a093c7;
-  }
-
-  #memory {
-    background-color: #a093c7;
-  }
-
-  #pulseaudio {
-    background-color: #a093c7;
-  }
-
-  #battery {
-    background-color: #a093c7;
-  }
-
-  #battery.full {
-    background-color: #a093c7;
-    color: #18191f;
-  }
-
-  #battery.discharging {
-    background-color: #a093c7;
-    color: #18191f;
-  }
-
-  #battery.charging {
-    background-color: #a093c7;
-    color: #18191f;
-  }
-
-  #battery.warning:not(.charging) {
-    background-color: #a093c7;
-    color: #18191f;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
-  }
 ''
diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix
index 1c584f0..20ddb77 100644
--- a/home/modules/profiles/base/default.nix
+++ b/home/modules/profiles/base/default.nix
@@ -18,8 +18,6 @@ in
       gtk.enable = true;
       gtk.iconTheme.package = pkgs.papirus-icon-theme;
       gtk.iconTheme.name = "Papirus-Dark";
-      #gtk.theme.package = pkgs.phocus;
-      #gtk.theme.name = "phocus";
 
       home.keyboard.layout = "us";
       home.packages = [