From c969646804ba1af3ad50717161118a28270a32fe Mon Sep 17 00:00:00 2001
From: pagedMov <pagedMov@gmail.com>
Date: Fri, 11 Oct 2024 21:19:04 -0400
Subject: [PATCH] Gen 383: waybar tweaks

---
 flake.lock                                  |  8 +++----
 glasshouse-desktop/home/starship.nix        | 13 ++++++------
 glasshouse-desktop/home/waybar/settings.nix |  9 ++++++++
 glasshouse-desktop/home/waybar/style.nix    | 23 +++++++++------------
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index 20a4ed4..32fa502 100644
--- a/flake.lock
+++ b/flake.lock
@@ -442,11 +442,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1728645556,
-        "narHash": "sha256-Nio2vUxaya04xlvY24sPTOWz+mmDwgRgrBSU4Vx485Y=",
+        "lastModified": 1728692991,
+        "narHash": "sha256-lPjl4phydWEjM3PUUqMkDbna/oxNnKJp6+I21TWtxbc=",
         "ref": "refs/heads/main",
-        "rev": "7564b26b7d386d248eaa47c1a481c09eefd8e3ca",
-        "revCount": 5328,
+        "rev": "ee8116ac5dc412dce924a0163074ce7988dd0cfc",
+        "revCount": 5330,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
diff --git a/glasshouse-desktop/home/starship.nix b/glasshouse-desktop/home/starship.nix
index 263e47b..78f2ef1 100644
--- a/glasshouse-desktop/home/starship.nix
+++ b/glasshouse-desktop/home/starship.nix
@@ -5,13 +5,14 @@
 		enable = true;
 		enableZshIntegration = false;
 		settings = {
+			add_newline = true;
 		# right_format = "";
 
 			format = lib.concatStrings [
-				"($username)(bold white)($cmd_duration)($character)$line_break"
-				"($git_branch)($git_status)$line_break"
-				"($directory)$line_break"
-				"[   ](bold #89b4fa)"
+				"($username)(bold white)($cmd_duration)($character)"
+				"($git_branch)($git_status)"
+				"($directory)"
+				"$line_break[   ](bold #89b4fa)"
 			];
 
 			
@@ -21,7 +22,7 @@
 				format = "[$user]($style)";
 			};
 			directory = {
-				format = "[$path](bold cyan)[/](bold green) ";
+				format = "\n[$path](bold cyan)[/](bold green) ";
 				style = "bold #b4befe";
 			};
 
@@ -39,7 +40,7 @@
 				min_time_to_notify = 60000;
 			};
 			git_branch = {
-				format = "on [$symbol$branch](bold purple)";  
+				format = "\non [$symbol$branch](bold purple)";  
 				symbol = " ";  
 				truncation_length = 15;
 				style = "bold purple";
diff --git a/glasshouse-desktop/home/waybar/settings.nix b/glasshouse-desktop/home/waybar/settings.nix
index fcb87ef..602769a 100644
--- a/glasshouse-desktop/home/waybar/settings.nix
+++ b/glasshouse-desktop/home/waybar/settings.nix
@@ -11,6 +11,7 @@
     margin-right= 0;
     modules-left= [
         "custom/launcher" 
+		"custom/separator"
         "hyprland/workspaces"
     ];
     modules-center= [
@@ -18,12 +19,15 @@
     ];
     modules-right= [
         "tray" 
+		"custom/separator"
         "cpu"
         "memory"
         "disk"
+		"custom/separator"
         "pulseaudio" 
         "battery"
         "network"
+		"custom/separator"
         "custom/notification"
     ];
     clock= {
@@ -136,5 +140,10 @@
         on-click-right = "swaync-client -d -sw";
         escape = true;
     };
+	"custom/separator" =  {
+		exec = "echo ' | '";
+		interval = 600; 
+		tooltip = false;
+	};
   };
 }
diff --git a/glasshouse-desktop/home/waybar/style.nix b/glasshouse-desktop/home/waybar/style.nix
index 842ec22..9254a62 100644
--- a/glasshouse-desktop/home/waybar/style.nix
+++ b/glasshouse-desktop/home/waybar/style.nix
@@ -2,10 +2,10 @@
 
 let custom = {
     font = "JetBrainsMono Nerd Font";
-    font_size = "15px";
+    font_size = "22px";
     font_weight = "bold";
     text_color = "#cdd6f4";
-    secondary_accent= "#89b4fa";
+    secondary_accent = "#89b4fa";
     tertiary_accent = "#f5f5f5";
     background = "#11111B";
 };
@@ -28,8 +28,7 @@ in
     }
 
     #workspaces {
-        font-size: 18px;
-        padding-left: 15px;
+        font-size: ${custom.font_size};
         
     }
     #workspaces button {
@@ -50,9 +49,8 @@ in
     }
 
     #cpu {
-        padding-left: 15px;
+        padding-left: 5px;
         padding-right: 9px;
-        margin-left: 7px;
     }
     #memory {
         padding-left: 9px;
@@ -60,18 +58,17 @@ in
     }
     #disk {
         padding-left: 9px;
-        padding-right: 15px;
+        padding-right: 5px;
     }
 
     #tray {
-        padding: 0 20px;
         margin-left: 7px;
+        padding-right: 5px;
     }
 
     #pulseaudio {
-        padding-left: 15px;
+        padding-left: 5px;
         padding-right: 9px;
-        margin-left: 7px;
     }
     #battery {
         padding-left: 9px;
@@ -79,11 +76,11 @@ in
     }
     #network {
         padding-left: 9px;
-        padding-right: 30px;
+        padding-right: 5px;
     }
 
     custom-notification {
-        padding-left: 20px;
+        padding-left: 15px;
         padding-right: 20px;
     }
     
@@ -93,7 +90,7 @@ in
     }
 
     #custom-launcher {
-        font-size: 20px;
+        font-size: ${custom.font_size};
         color: #b4befe;
         font-weight: ${custom.font_weight};
         padding-left: 10px;