From 6abc51f47a5e9cb698361bcd1cc0f3a8b1b6bc41 Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Wed, 7 Aug 2024 07:48:46 -0700
Subject: [PATCH] style: initial waybar rice on callisto

---
 users/youwen/linux/waybar/laptop/default.nix | 12 +++++------
 users/youwen/linux/waybar/laptop/waybar.css  | 21 +++++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/users/youwen/linux/waybar/laptop/default.nix b/users/youwen/linux/waybar/laptop/default.nix
index 43322b9..8081790 100644
--- a/users/youwen/linux/waybar/laptop/default.nix
+++ b/users/youwen/linux/waybar/laptop/default.nix
@@ -6,12 +6,12 @@
         layer = "top";
         position = "top";
         height = 24;
-        width = 1000;
+        # width = 1000;
         reload-style-on-change = true;
-        margin = "10px 0px 0px 0px";
-        modules-left = [ "hyprland/window" "hyprland/workspaces" ];
-        modules-right = [ "backlight" "group/adjustable" "custom/weather" ];
-        modules-center = [ "network" "group/hardware" "clock" ];
+        margin = "5px 0px 0px 0px";
+        modules-left = [ "hyprland/window" "hyprland/workspaces" "network" "clock" ];
+        modules-right = [ "group/hardware" "backlight" "group/adjustable" "custom/weather" ];
+        # modules-center = [ "network" "group/hardware" "clock" ];
         "hyprland/workspaces" = {
           active-only = false;
           all-outputs = false;
@@ -23,7 +23,7 @@
         };
         "group/hardware" = {
           orientation = "inherit";
-          modules = [ "cpu" "memory" "battery" ];
+          modules = [ "cpu" "battery" ];
         };
         "group/adjustable" = {
           orientation = "inherit";
diff --git a/users/youwen/linux/waybar/laptop/waybar.css b/users/youwen/linux/waybar/laptop/waybar.css
index 0d7dbfc..bcca64c 100755
--- a/users/youwen/linux/waybar/laptop/waybar.css
+++ b/users/youwen/linux/waybar/laptop/waybar.css
@@ -1,5 +1,5 @@
 * {
-  font-size: 10px;
+  font-size: 12px;
 }
 
 window#waybar {
@@ -59,6 +59,10 @@ window#waybar {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
 }
+#network {
+  margin-left: 15px;
+  padding-right: 15px;
+}
 #mpris {
   padding-left: 0px;
   margin-left: 0px;
@@ -76,9 +80,9 @@ window#waybar {
 #memory,
 #cpu {
   padding-right: 2px;
-  /* border-top-right-radius: 0px; */
-  /* border-bottom-right-radius: 0px; */
-  /* border-right-width: 0px; */
+  border-top-right-radius: 0px; 
+  border-bottom-right-radius: 0px; 
+  border-right-width: 0px; 
 }
 #memory,
 #battery {
@@ -88,14 +92,17 @@ window#waybar {
   border-bottom-left-radius: 0px;
   border-left-width: 0px;
 }
+#cpu {
+  margin-right: 0px;
+}
 #battery {
   padding-right: 13px;
 }
 #custom-weather {
-  margin-right: 0px;
+  margin-right: 10px;
 }
 
 #window {
-  margin-right: 0px;
-  margin-left: 0px;
+  margin-right: 10px;
+  margin-left: 10px;
 }