From 542161942aa1f230a5f70591ad6f9f6ecf62c6a0 Mon Sep 17 00:00:00 2001
From: Nick Boughton <nicholasboughton@gmail.com>
Date: Sun, 17 Oct 2021 00:39:09 +0100
Subject: [PATCH] no space wasted

---
 sway/config   |   6 +-
 waybar/config | 152 ++++++++++++++++++++++++++------------------------
 2 files changed, 83 insertions(+), 75 deletions(-)

diff --git a/sway/config b/sway/config
index 0010cf7..8c50917 100644
--- a/sway/config
+++ b/sway/config
@@ -255,9 +255,9 @@ bar {
 #
 # gaps
 #
-gaps outer 10
-gaps top -10
-gaps bottom -10
+#gaps outer 10
+#gaps top -10
+#gaps bottom -10
 smart_gaps off
 smart_borders on
 
diff --git a/waybar/config b/waybar/config
index 5b0fc77..ea72e75 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,76 +1,30 @@
 // -*- mode: json -*-
-[
-	{
-		"position": "bottom",
-		"layer": "bottom",
-		"margin-left": 10,
-		"margin-right": 10,
-		"margin-bottom": 10,
-		"modules-left": [
-			"sway/mode",
-			"wlr/taskbar"
-		],
-		"modules-right": [
-			"custom/gpuuse",
-			"custom/gputemp",
-			"custom/separator",
-			"custom/weather",
-			"custom/separator",
-			"tray"
-		],
-		"sway/mode": {
-			"format": "{}"
-		},
-		"wlr/taskbar": {
-			"all-outputs": false,
-			"format": "{icon} {title:.15}",
-			"icon-theme": "Tela-circle-blue-dark",
-			"icon-size": 14,
-			"on-click": "activate",
-			"on-middle-click": "close",
-			"on-right-click": "minimize"
-		},
-		"tray": {
-			"icon-size": 12,
-			"spacing": 10
-		},
-		"custom/separator": {
-			"format": "|",
-			"tooltip": false
-		},
-		"custom/weather": {
-			"format": "{}",
-			"exec": "~/.config/waybar/modules/weather.sh",
-			"interval": 3600
-		},
-		"custom/gputemp": {
-			"interval": 2,
-			"return-type": "json",
-			"format": "{icon}",
-			"format-icons": [
-				"",
-				"",
-				"",
-				"",
-				""
-			],
-			"exec": "~/.config/waybar/modules/gpu/temp",
-			"on-click": "kitty radeontop"
-		},
-		"custom/gpuuse": {
-			"interval": 2,
-			"return-type": "json",
-			"format": " ",
-			"exec": "~/.config/waybar/modules/gpu/usage",
-			"on-click": "kitty radeontop"
-		}
-	},
+//[
+//	{
+//		"position": "bottom",
+//		"layer": "bottom",
+//		"margin-left": 10,
+//		"margin-right": 10,
+//		"margin-bottom": 10,
+//		"modules-left": [
+//			"sway/mode",
+//			"wlr/taskbar"
+//		],
+//		"modules-right": [
+//			"custom/gpuuse",
+//			"custom/gputemp",
+//			"custom/separator",
+//			"custom/weather",
+//			"custom/separator",
+//			"tray"
+//		],
+//	},
 	{
 		"position": "top",
 		"layer": "bottom",
-		"margin-top": 10,
-		"margin-right": 10,
-		"margin-left": 10,
+		"margin-top": 0,
+		"margin-right": 0,
+		"margin-left": 0,
 		"modules-center": [
 			"sway/workspaces"
 		],
@@ -84,10 +38,16 @@
 			//"custom/separator",
 			"memory",
 			"cpu",
-			"custom/cputemp"
+			"custom/cputemp",
+			"custom/separator",
+			"custom/gpuuse",
+			"custom/gputemp",
+			"custom/separator",
+			"idle_inhibitor",
+			"sway/mode"
 		],
 		"modules-right": [
-			"idle_inhibitor",
+			"custom/weather",
 			"custom/separator",
 			"custom/covid",
 			//"custom/separator",
@@ -98,6 +58,8 @@
 			//"custom/separator",
 			"pulseaudio",
 			"custom/separator",
+			"tray",
+			"custom/separator",
 			"custom/powermenu"
 		],
 		"sway/workspaces": {
@@ -211,6 +173,52 @@
 			"format": "",
 			"path": "/home"
 		},
+		"sway/mode": {
+			"format": "{}"
+		},
+		"wlr/taskbar": {
+			"all-outputs": false,
+			"format": "{icon} {title:.15}",
+			"icon-theme": "Tela-circle-blue-dark",
+			"icon-size": 14,
+			"on-click": "activate",
+			"on-middle-click": "close",
+			"on-right-click": "minimize"
+		},
+		"tray": {
+			"icon-size": 12,
+			"spacing": 10
+		},
+		"custom/separator": {
+			"format": "|",
+			"tooltip": false
+		},
+		"custom/weather": {
+			"format": "{}",
+			"exec": "~/.config/waybar/modules/weather.sh",
+			"interval": 3600
+		},
+		"custom/gputemp": {
+			"interval": 2,
+			"return-type": "json",
+			"format": "{icon}",
+			"format-icons": [
+				"",
+				"",
+				"",
+				"",
+				""
+			],
+			"exec": "~/.config/waybar/modules/gpu/temp",
+			"on-click": "kitty radeontop"
+		},
+		"custom/gpuuse": {
+			"interval": 2,
+			"return-type": "json",
+			"format": " ",
+			"exec": "~/.config/waybar/modules/gpu/usage",
+			"on-click": "kitty radeontop"
+		},
 		"custom/updates": {
 			"format": " {}",
 			"return-type": "json",
@@ -275,4 +283,4 @@
 			]
 		}
 	}
-]
+//]