From 361f183a53e427c09fd32d632831200110a89d98 Mon Sep 17 00:00:00 2001
From: Tyler Kelley <tylerzanekelley@gmail.com>
Date: Wed, 24 Jan 2024 03:48:25 -0600
Subject: [PATCH] Finish adding style 1 and 2

---
 config/home/style2-waybar.nix | 141 +++++++++++++++++-----------------
 flake.nix                     |   2 +-
 2 files changed, 71 insertions(+), 72 deletions(-)

diff --git a/config/home/style2-waybar.nix b/config/home/style2-waybar.nix
index 8daa42c..c155b67 100644
--- a/config/home/style2-waybar.nix
+++ b/config/home/style2-waybar.nix
@@ -80,15 +80,15 @@ lib.mkIf ("${waybarStyle}" == "style2") {
       };
       "custom/startmenu" = {
         tooltip = false;
-        format = "";
+        format = " ";
         # exec = "rofi -show drun";
         on-click = "rofi -show drun";
       };
       "idle_inhibitor" = {
         format = "{icon}";
         format-icons = {
-            activated = "";
-            deactivated = "";
+            activated = " ";
+            deactivated = " ";
         };
         tooltip = "true";
       };
@@ -137,10 +137,10 @@ lib.mkIf ("${waybarStyle}" == "style2") {
 		    color: #${config.colorScheme.colors.base0F};
 	}
 	#workspaces {
-		    background: linear-gradient(180deg, #${config.colorScheme.colors.base01}, #${config.colorScheme.colors.base02});
-    		margin: 5px;
+		    background: #${config.colorScheme.colors.base01};
+    		margin: 4px;
     		padding: 0px 1px;
-    		border-radius: 15px;
+    		border-radius: 10px;
     		border: 0px;
     		font-style: normal;
     		color: #${config.colorScheme.colors.base00};
@@ -148,27 +148,26 @@ lib.mkIf ("${waybarStyle}" == "style2") {
 	#workspaces button {
     		padding: 0px 5px;
     		margin: 4px 3px;
-    		border-radius: 15px;
+    		border-radius: 10px;
     		border: 0px;
     		color: #${config.colorScheme.colors.base00};
-    		# background-color: #${config.colorScheme.colors.base00};
-		    background: linear-gradient(180deg, #${config.colorScheme.colors.base01}, #${config.colorScheme.colors.base02});
-    		opacity: 1.0;
+		    background: linear-gradient(45deg, #${config.colorScheme.colors.base06}, #${config.colorScheme.colors.base0E});
+    		opacity: 0.5;
     		transition: all 0.3s ease-in-out;
 	}
 	#workspaces button.active {
     		color: #${config.colorScheme.colors.base00};
-    		background: #${config.colorScheme.colors.base04};
-    		border-radius: 15px;
+		    background: linear-gradient(45deg, #${config.colorScheme.colors.base06}, #${config.colorScheme.colors.base0E});
+    		border-radius: 10px;
     		min-width: 40px;
     		transition: all 0.3s ease-in-out;
     		opacity: 1.0;
 	}
 	#workspaces button:hover {
     		color: #${config.colorScheme.colors.base00};
-    		background: #${config.colorScheme.colors.base04};
-    		border-radius: 15px;
-    		opacity: 1.0;
+		    background: linear-gradient(45deg, #${config.colorScheme.colors.base06}, #${config.colorScheme.colors.base0E});
+    		border-radius: 10px;
+    		opacity: 0.8;
 	}
 	tooltip {
   		background: #${config.colorScheme.colors.base00};
@@ -180,101 +179,101 @@ lib.mkIf ("${waybarStyle}" == "style2") {
 	}
 	#window {
     		color: #${config.colorScheme.colors.base05};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 0px 15px 50px 0px;
-    		margin: 5px 5px 5px 0px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px;
 	}
 	#memory {
     		color: #${config.colorScheme.colors.base0F};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 15px 50px 15px 50px;
-    		margin: 5px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px;
 	}
 	#clock {
     		color: #${config.colorScheme.colors.base0B};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 15px 50px 15px 50px;
-    		margin: 5px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px;
 	}
 	#idle_inhibitor {
     		color: #${config.colorScheme.colors.base0A};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 50px 15px 50px 15px;
-    		margin: 5px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px;
 	}
 	#cpu {
     		color: #${config.colorScheme.colors.base07};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 50px 15px 50px 15px;
-    		margin: 5px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px;
 	}
 	#disk {
     		color: #${config.colorScheme.colors.base03};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 15px 50px 15px 50px;
-    		margin: 5px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px;
 	}
 	#battery {
     		color: #${config.colorScheme.colors.base08};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 15px;
-    		margin: 5px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px;
 	}
 	#network {
     		color: #${config.colorScheme.colors.base09};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 50px 15px 50px 15px;
-    		margin: 5px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px;
 	}
 	#tray {
     		color: #${config.colorScheme.colors.base05};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 15px 0px 0px 50px;
-    		margin: 5px 0px 5px 5px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px;
 	}
 	#pulseaudio {
     		color: #${config.colorScheme.colors.base0D};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 50px 15px 50px 15px;
-    		margin: 5px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px;
 	}
 	#custom-notification {
     		color: #${config.colorScheme.colors.base0C};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 15px 50px 15px 50px;
-    		margin: 5px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px;
 	}
     #custom-themeselector {
     		color: #${config.colorScheme.colors.base0D};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 15px 50px 15px 50px;
-    		margin: 5px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px;
     }
 	#custom-startmenu {
     		color: #${config.colorScheme.colors.base03};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 50px 15px 50px 15px;
-    		margin: 5px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px 2px 13px;
 	}
 	#idle_inhibitor {
     		color: #${config.colorScheme.colors.base09};
-    		background: #${config.colorScheme.colors.base00};
-    		border-radius: 15px 50px 15px 50px;
-    		margin: 5px;
-    		padding: 2px 20px;
+    		background: #${config.colorScheme.colors.base01};
+    		border-radius: 10px;
+    		margin: 4px;
+    		padding: 2px 10px 2px 13px;
 	}
     '';
   };
diff --git a/flake.nix b/flake.nix
index 0c5b2a4..8612a95 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,7 +27,7 @@
     theLCVariables = "en_US.UTF-8";
     theTimezone = "America/Chicago";
     theme = "gigavolt";
-    waybarStyle = "style1"; # can be style1-2
+    waybarStyle = "style2"; # can be style1-2
     browser = "firefox";
     wallpaperGit = "https://gitlab.com/Zaney/my-wallpapers.git";
     wallpaperDir = "/home/${username}/Pictures/Wallpapers";