From fafc397c481bcd3fd71957f2fb87debe92a11807 Mon Sep 17 00:00:00 2001
From: Nick Boughton <nicholasboughton@gmail.com>
Date: Fri, 4 Dec 2020 22:37:08 +0000
Subject: [PATCH] re-ordered items

---
 sway/config      | 25 +++++++++++++++++++++++--
 waybar/config    | 44 ++++++++++++++++++++++++--------------------
 waybar/style.css | 20 ++++++++++----------
 3 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/sway/config b/sway/config
index 994961c..6bbc23f 100644
--- a/sway/config
+++ b/sway/config
@@ -20,15 +20,36 @@ set $term alacritty
 set $menu wofi -c ~/.config/wofi/config -s ~/.config/wofi/style.css -I
 
 ### Output configuration
+# Arch logo
 #output * bg /home/nick/Pictures/VEU9Nr4.png fill
+# Starry Mountain
 #output * bg /home/nick/Pictures/Starry\ Sky\ wallpapers\ Snowy\ Mountain\ Starry\ Sky\ stock\ photos.jpg fill
+# Sad robot rainy day
 #output * bg /home/nick/Pictures/Rainy-Day-Wallpaper.jpg fill
-#output * bg /home/nick/Pictures/803094.jpg fill
+# Mountain symmetry
+#output * bg /home/nick/Pictures/803094-1.jpg fill
+# Carpark robot man (Stalenhag_
 #output * bg /home/nick/Pictures/EmtJwQGXEAI99ZS.jpg fill
-output * bg /home/nick/Pictures/SBKjnxm.jpeg fill
+# Pine cone
+#output * bg /home/nick/Pictures/tr1xr97470361.jpg fill
+# White mountains
+#output * bg /home/nick/Pictures/SBKjnxm.jpeg fill
+# Robot man at the pier
 #output * bg /home/nick/Pictures/ark_bryggan_big.jpg fill
+# Rainbow nord
 #output * bg /home/nick/Pictures/Nord_minimalism_colorful-1928527.png fill
+# Hexagon nord sky
 #output * bg /home/nick/Pictures/59bsn5hgnojy.jpg fill
+# Autumn
+#output * bg /home/nick/Pictures/Autumn-8.jpg fill
+# Snow on branches
+#output * bg /home/nick/Pictures/snow-branches.jpg fill
+# icy branches
+#output * bg /home/nick/Pictures/cb8cba93eff131b9adca42f384418dc0.jpg fill
+# autumn road
+#output * bg /home/nick/Pictures/Forests_Autumn_Roads_Trees_Foliage_Fog_557212_1920x1080.jpg fill
+# Rowboat
+output * bg /home/nick/Pictures/eNHamv.jpg fill
 
 ### Gnome settings
 set $gnome-schema org.gnome.desktop.interface
diff --git a/waybar/config b/waybar/config
index a688bbc..d8c73fb 100644
--- a/waybar/config
+++ b/waybar/config
@@ -7,24 +7,29 @@
 	"margin-left": 5,
 	"modules-left": [
 		"sway/workspaces",
+		"custom/separator",
 		"idle_inhibitor",
+		"custom/separator",
 		"sway/mode",
 	],
 	"modules-center": [
-		"clock",
-		"custom/pacman",
-		"custom/weather"
+		"custom/pacman"
 	],
 	"modules-right": [
 		"cpu",
+		"custom/separator",
 		"memory",
-		//"custom/swap",
-		//"disk#1",
-		//"disk#2",
-		"tray",
+		"custom/swap",
+		"custom/separator",
+		"disk#1",
+		"disk#2",
+		"custom/separator",
+		"backlight",
+		"custom/separator",
+		"battery",
+		"custom/separator",
 		"pulseaudio",
-		//"backlight",
-		"battery"
+		"clock"
 	],
 	"sway/workspaces": {
 		"disable-scroll": true,
@@ -115,10 +120,6 @@
 		"format": " {percentage_used:2}%",
 		"path": "/home"
 	},
-	"tray": {
-		"icon-size": 12,
-		"spacing": 10
-	},
 	"custom/pacman": {
 		"format": " {}",
 		"interval": 1800, // every 30 minutes
@@ -128,10 +129,6 @@
 		"signal": 8,
 		"tooltip": false
 	},
-	"custom/weather": {
-		"exec": "~/.config/waybar/modules/weather.sh",
-		"interval": 3600
-	},
 	"custom/swap": {
 		"format": " {}",
 		"interval": 5,
@@ -149,12 +146,11 @@
 	"margin-right": 5,
 	"margin-left": 5,
 	"margin-bottom": 5,
-	"modules-left": ["wlr/taskbar"],
+	"modules-left": ["custom/weather", "wlr/taskbar"],
 	"modules-center": [],
-	"modules-right": ["custom/spotify"],
+	"modules-right": ["tray", "custom/spotify"],
 	"wlr/taskbar": {
 		"all-outputs": false,
-		"active-first": true,
 		"format": "{icon} {title:.15}...",
 		"icon-theme": "DarK-svg",
 		"icon-size": 12,
@@ -162,6 +158,14 @@
 		"on-middle-click": "close",
 		"on-right-click": "minimize"
 	},
+	"tray": {
+		"icon-size": 12,
+		"spacing": 10
+	},
+	"custom/weather": {
+		"exec": "~/.config/waybar/modules/weather.sh",
+		"interval": 3600
+	},
 	"custom/spotify": {
 		"interval": 1,
 		"return-type": "json",
diff --git a/waybar/style.css b/waybar/style.css
index 41a271e..6644a51 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -3,12 +3,6 @@
 	font-family: Roboto;
 }
 
-/*
-window.eDP-1 * {
-	font-size: 12px;
-}
-*/
-
 window#waybar {
 	color: #d8dee9;
 	background: rgba(46,52,64, 0.75);
@@ -70,17 +64,23 @@ window#waybar {
 	padding-left: 3px;
 }
 
-#battery,
+#clock,
 #custom-spotify {
 	background: rgba(94,129,172, 0.75);
 	border-top-right-radius: 7px;
 	border-bottom-right-radius: 7px;
 }
 
-#pulseaudio {
+#custom-pacman {
 	background: rgba(94,129,172, 0.75);
 }
 
+#custom-weather {
+	background: rgba(94,129,172, 0.75);
+	border-top-left-radius: 7px;
+	border-bottom-left-radius: 7px;
+}
+
 #workspaces {
 	padding: 0px;
 }
@@ -102,10 +102,10 @@ window#waybar {
 #taskbar button {
 	border-radius: 0px;
 	padding-right: 3px;
+	padding-top: 0px;
+	padding-bottom: 0px;
 	text-shadow: 1px 1px 1px #2e3440;
 }
 #taskbar button.active {
 	background: rgba(94,129,172, 0.75);
-	border-top-left-radius: 7px;
-	border-bottom-left-radius: 7px;
 }