From 1a94f0e760b9e0b92629fa825ed63a7890a462e7 Mon Sep 17 00:00:00 2001
From: Dmitry Voronin <hi@voronind.com>
Date: Fri, 13 Dec 2024 11:59:15 +0300
Subject: [PATCH] Waybar: Remove tray & language.

---
 home/file/waybar/config/default.nix | 14 ++------------
 home/file/waybar/style/Plugin.nix   | 12 +++---------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/home/file/waybar/config/default.nix b/home/file/waybar/config/default.nix
index 721c7257..7a6f4c2e 100644
--- a/home/file/waybar/config/default.nix
+++ b/home/file/waybar/config/default.nix
@@ -20,7 +20,6 @@ in {
 		];
 		modules-left = [
 			"clock"
-			# "sway/language"
 			"sway/scratchpad"
 			"mpris"
 		];
@@ -33,16 +32,10 @@ in {
 			"pulseaudio"
 			"custom/display"
 			"custom/network"
-			# "tray"
 		];
 		"sway/workspaces" = {
 			all-outputs = true;
 		};
-		"sway/language" = {
-			on-click       = "swaymsg 'input * xkb_switch_layout next'";
-			on-click-right = "xdg-open https://translate.yandex.ru/";
-			tooltip        = false;
-		};
 		"sway/scratchpad" = {
 			format          = "{icon}  {count}";
 			on-click        = "swaymsg 'scratchpad show'";
@@ -55,9 +48,6 @@ in {
 				""
 			];
 		};
-		tray = {
-			spacing = 8;
-		};
 		clock = {
 			format-alt     = "{:%H:%M %a %d %b}";
 			on-click-right = "xdg-open https://cloud.voronind.com/apps/calendar/";
@@ -104,8 +94,8 @@ in {
 			format-muted        = "󰸈{format_source}";
 			format-source       = "";
 			format-source-muted = " 󰍭";
-			on-click            = "pactl set-sink-mute @DEFAULT_SINK@ toggle";
-			on-click-middle     = "pavucontrol";
+			on-click            = "pavucontrol";
+			on-click-middle     = "pactl set-sink-mute @DEFAULT_SINK@ toggle";
 			on-click-right      = "pactl set-source-mute @DEFAULT_SOURCE@ toggle";
 			scroll-step         = 5;
 		};
diff --git a/home/file/waybar/style/Plugin.nix b/home/file/waybar/style/Plugin.nix
index 8389fb47..610ad752 100644
--- a/home/file/waybar/style/Plugin.nix
+++ b/home/file/waybar/style/Plugin.nix
@@ -24,11 +24,9 @@ in {
 		#clock,
 		#custom-display,
 		#custom-network,
-		#language,
 		#mpris,
 		#pulseaudio,
-		#scratchpad,
-		#tray {
+		#scratchpad {
 			padding: ${paddingV} ${paddingH};
 		}
 
@@ -47,11 +45,9 @@ in {
 		#custom-display:hover,
 		#custom-network:hover,
 		#hardware:hover,
-		#language:hover,
 		#mpris:hover,
 		#pulseaudio:hover,
 		#scratchpad:hover,
-		#tray:hover,
 		#workspaces button:hover {
 			background-color: rgba(${config.module.style.color.borderR},${config.module.style.color.borderG},${config.module.style.color.borderB},${toString config.module.style.opacity.desktop});
 		}
@@ -63,8 +59,7 @@ in {
 		#custom-network,
 		#memory,
 		#pulseaudio,
-		#temperature,
-		#tray {
+		#temperature {
 			border-top: ${toString config.module.style.window.border}px solid transparent;
 			border-bottom: ${toString config.module.style.window.border}px solid transparent;
 		}
@@ -77,8 +72,7 @@ in {
 		#memory.critical,
 		#pulseaudio.muted,
 		#pulseaudio.source-muted,
-		#temperature.critical,
-		#tray.needs-attention {
+		#temperature.critical {
 			border-top: ${toString config.module.style.window.border}px solid #${config.module.style.color.accent};
 		}