From af1ab5327d98affc91937ecd1e4c2f7f78441494 Mon Sep 17 00:00:00 2001
From: Nick Boughton <nicholasboughton@gmail.com>
Date: Sun, 22 Nov 2020 22:21:40 +0000
Subject: [PATCH] taskbar now working

---
 sway/config      | 10 +++++-----
 waybar/config    | 12 ++++--------
 waybar/style.css | 23 ++++++++---------------
 3 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/sway/config b/sway/config
index 0d3226a..3808da9 100644
--- a/sway/config
+++ b/sway/config
@@ -27,13 +27,13 @@ set $gnome-schema org.gnome.desktop.interface
 exec_always {
     gsettings set $gnome-schema gtk-theme 'NordSur-dark'
     gsettings set $gnome-schema icon-theme 'Tela-circle-grey-dark'
-    gsettings set org.gnome.desktop.default-applications.terminal exec alacritty
-    gsettings set org.gnome.desktop.default-applications.terminal exec-arg -e
-    gsettings set org.gnome.desktop.interface monospace-font-name 'Roboto Mono 10'
-    gsettings set org.gnome.desktop.interface document-font-name 'Roboto 10'
-    gsettings set org.gnome.desktop.interface font-name 'Roboto 10'
+    gsettings set $gnome-schema font-name 'Roboto 10'
+    gsettings set $gnome-schema monospace-font-name 'Roboto Mono 10'
+    gsettings set $gnome-schema document-font-name 'Roboto 10'
     gsettings set org.gnome.desktop.wm.preferences titlebar-font 'Roboto Bold 10'
     gsettings set org.gnome.desktop.wm.preferences button-layout ''
+    gsettings set org.gnome.desktop.default-applications.terminal exec alacritty
+    gsettings set org.gnome.desktop.default-applications.terminal exec-arg -e
 }
 
 
diff --git a/waybar/config b/waybar/config
index 82e84e1..bcf7b59 100644
--- a/waybar/config
+++ b/waybar/config
@@ -4,8 +4,7 @@
 	"position": "top",
 	"modules-left": [
 		"sway/workspaces",
-		//"wlr/taskbar",
-		//"sway/window",
+		"wlr/taskbar",
 		"sway/mode",
 		"custom/spotify",
 		"idle_inhibitor"
@@ -42,10 +41,6 @@
 	"sway/mode": {
 		"format": "{}"
 	},
-	"sway/window": {
-		"format": "{}",
-		"max-length": 15
-	},
 	"backlight": {
 		"format": "{icon} {percent}%",
 		"format-icons": ["", ""],
@@ -53,9 +48,10 @@
 		"on-scroll-down": "brightnessctl set 5%-"
 	},
 	"wlr/taskbar": {
+		"all-outputs": true,
 		"format": "{icon}",
-		"icon-theme": "Tela-circle-grey-dark",
-		"icon-size": 11,
+		"icon-theme": "DarK-svg",
+		"icon-size": 12,
 		"on-click": "activate"
 	},
 	"clock": {
diff --git a/waybar/style.css b/waybar/style.css
index 0e8a7ad..b818e50 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -117,22 +117,15 @@ window#waybar {
 	border-radius: 4px 0px 0px 4px;
 }
 
-/* Taskbar doesn't currently work
-#taskbar {
-	border-radius: 0px 8px 8px 0;
-	padding: 0 3px;
-	margin: 0 0px;
-	color: #ffffff;
-	background-color: rgba(120,118,117,0.3);
-}
+/*#taskbar {
+}*/
 #taskbar button {
-	border-radius: 3px 3px 3px 3px;
-	padding: 0 0 0 3px;
-	margin: 3px 1;
-	color: #ffffff;
-	background-color: rgba(120,118,117,0.1);
+	padding-top: 0px;
+	padding-bottom: 0px;
+	padding-left: 5px;
+	padding-right: 1px;
+	border-radius: 0px;
 }
 #taskbar button.active {
-	background-color: rgba(120,118,117,0.8);
+	background: #81a1c1;
 }
-*/