From 6747ddd9c924e1d1c6f30683ae89b2a6a45e7dc0 Mon Sep 17 00:00:00 2001
From: EinEtwas <ein@etwas.me>
Date: Tue, 15 Oct 2024 11:17:28 +0200
Subject: [PATCH] refactor: move waybar to module

---
 home/default.nix                        | 2 +-
 home/{waybar.nix => waybar/default.nix} | 9 +++++----
 home/{ => waybar}/waybar.css            | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)
 rename home/{waybar.nix => waybar/default.nix} (93%)
 rename home/{ => waybar}/waybar.css (97%)

diff --git a/home/default.nix b/home/default.nix
index ba8ff74..551b99b 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -28,7 +28,7 @@
       imports = [
         ./hyprland.nix
         ./git.nix
-        ./waybar.nix
+        ./waybar
         ./dunst.nix
         ./wofi.nix
         ./swaylock.nix
diff --git a/home/waybar.nix b/home/waybar/default.nix
similarity index 93%
rename from home/waybar.nix
rename to home/waybar/default.nix
index 338e004..564d5c2 100644
--- a/home/waybar.nix
+++ b/home/waybar/default.nix
@@ -15,9 +15,9 @@
           "eDP-1"
         ];
 
-        modules-left = ["hyprland/workspaces" "hyprland/mode" "cpu" "memory"];
+        modules-left = ["hyprland/workspaces" "hyprland/mode"];
         modules-center = [];
-        modules-right = ["pulseaudio" "backlight" "network" "battery" "clock"];
+        modules-right = ["pulseaudio" "backlight" "network" "battery" "clock" "tray"];
 
 
         cpu = {
@@ -78,8 +78,9 @@
           "format-alt" = "{:%a, %d. %b  %H:%M}";
         };
 
-
-
+        tray = {
+          "spacing" = 7;
+        };
       };
     };
   };
diff --git a/home/waybar.css b/home/waybar/waybar.css
similarity index 97%
rename from home/waybar.css
rename to home/waybar/waybar.css
index 787fe7f..fb904ea 100644
--- a/home/waybar.css
+++ b/home/waybar/waybar.css
@@ -10,7 +10,7 @@
  * Keyframes
  * -------------------------------------------------------------------------- */
 
-@keyframes blink-warning {
+ @keyframes blink-warning {
     70% {
         color: white;
     }
@@ -177,8 +177,8 @@
     border-top: 2px solid transparent;
     /* To compensate for the top border and still have vertical centering */
     padding-bottom: 2px;
-    padding-left: 10px;
-    padding-right: 10px;
+    padding-left: 3px;
+    padding-right: 3px;
     color: #888888;
 }