[m] Various fixes and reverts

modules/home/wayland/apps/eww/bar/css/_sys.scss

@@ -23,15 +23,6 @@ color: $base0B;
     margin: $gaps-window 0;
 }
 
-
-.icon-text {
-    padding: 5pt;
-    font-size: 5pt;
-    font-weight: 900;
-}
-
-
-
 .cpu-core-usage, .gpu-core-usage, .memory-usage {
     background-color: $bg0;
     border-radius: $border-radius;

modules/home/wayland/apps/eww/bar/eww.scss

@@ -41,24 +41,30 @@ tooltip {
 .icon,
 .icon label { font-family: Material Design Icons; }
 
+.icon-text {
+  padding: 4pt;
+  font-size: 6pt;
+  font-weight: 900;
+}
+
 .grey {
-  background-color: $base02;
+  color: $base02;
 }
 
 .red {
-  background-color: $base0F;
+  color: $base0F;
 }
 
 .orange {
-  background-color: $base08;
+  color: $base08;
 }
 
 .green {
-  background-color: $base0B;
+  color: $base0B;
 }
 
 .blue {
-  background-color: $base0C;
+  color: $base0C;
 }
 
 /* WINDOW WRAPPER CSS */
@@ -116,17 +122,3 @@ tooltip {
 .bar label {
   font-size: 1.2rem;
 }
-
-/* WORKSPACE */
-
-.ws {
-  border-radius: $border-radius;
-  margin: $gaps-window;
-}
-
-.focused {
-  background-color: $bg1;
-  border-radius: 1rem;
-  margin: .3rem;
-  padding: .25rem;
-}

modules/home/wayland/apps/eww/bar/modules/workspaces.yuck

@@ -1,17 +1,22 @@
 (deflisten workspace :initial '[]' "scripts/workspaces")
 
 (defwidget workspace-mod []
-  (module
-  (eventbox
+  	(module
+  	  	(eventbox
 		:onscroll "echo {} | sed -e \"s/up/-1/g\" -e \"s/down/+1/g\" | xargs hyprctl dispatch workspace"
-		(box
-			:class "module workspaces"
-            :orientation "v"
-		  (for ws in workspace
-		    (button
-					:onclick "hyprctl dispatch workspace ${ws.number}"
-					:class "ws icon ${ws.color}"
-					; :tooltip {ws.tooltip}
-					(box
-						:class `${ws.focused ? "focused" : ""}`
-						:height 3)))))))
+			(box
+				:class "module workspaces"
+				:orientation "v"
+				(for ws in workspace
+					(button
+						:onclick "hyprctl dispatch workspace ${ws.number}"
+						(label 
+							:class "icon-text  ${ws.color}"
+							:text `${ws.focused ? "󰜗" : "󰝥"}`
+						)
+					)
+				)
+			)
+	  	)
+	)
+)

modules/home/wayland/apps/eww/default.nix

@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }: {
 
   config = lib.mkIf (config.homecfg.wm == "Wayland") {
-    home.packages = with pkgs; [ eww-wayland jaq ];
+    home.packages = with pkgs; [ eww-wayland jaq custom.amdgpu_top ];
 
     xdg.configFile."eww" = {
       source = lib.cleanSourceWith {