im bad at writing commits

private_dot_config/waybar/config

@@ -1,7 +1,7 @@
 {
     "position": "bottom",
     "modules-left": ["sway/workspaces"],
-    "modules-right": ["custom/music", "backlight", "pulseaudio", "battery", "clock", "tray"],
+    "modules-right": ["tray", "network", "backlight", "pulseaudio", "battery", "clock"],
     // Modules configuration
 	"sway/workspaces": {
 		"disable-scroll": true,
@@ -17,32 +17,17 @@
 	 		"8": [],
 	 		"9": [],
 	 		"10": []
-	},
+		},
      },
 	"tray": {
     	"spacing": 10,
 	},
-	"custom/music": {
-    		"format": " {}",
-		"interval": 1,
-		"exec": "/home/emily/.scripts/player.sh"
-	},
-	"clock": {
-		"format": " {:%H:%M}",
-        	"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        	"format-alt": " {:%d/%m/%Y}"
-	},
-	"battery": {
-        	"states": {
-            		"warning": 20,
-            		"critical": 5,
-        	},
-        	"format": "{icon} {capacity}%",
-        	"format-icons": {
-				"default": ["", "", "", "", ""],
-				"charging": ["", "", "", "", ""]
-			},
+
+	"network": {
+		"format": "{bandwidthDownBits} ↓↑ {bandwidthUpBits}",
+		"interval": 2
 	},
+
 	"backlight": {
 		"device": "intel_backlight",
 		"on-scroll-up": "light -A 10",
@@ -50,10 +35,28 @@
 		"format": "{icon} {percent}%",
 		"format-icons": ["", "", ""]
 	},
+
 	"pulseaudio": {
 		"on-click": "pavucontrol",
 		"format": "{icon} {volume}%",
         	"format-muted": "ﱝ Muted",
         "format-icons": ["", "", "墳", ""]
-    }
+    },
+
+	"battery": {
+		"states": {
+			"warning": 20,
+			"critical": 5,
+		},
+		"format": "{icon} {capacity}%",
+		"format-icons": {
+			"default": ["", "", "", "", ""],
+			"charging": ["", "", "", "", ""]
+		},
+	},
+
+	"clock": {
+		"format": " {:%a %b %d - %H:%M}",
+        	"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+	}
 }

private_dot_config/waybar/style.css

@@ -12,65 +12,61 @@ window#waybar {
 }
 
 #workspaces {
-	background-color: #24283b;
+	border: 2px solid #414868;
+	background-color: #1a1b26;
 	margin-bottom: 8px;
 	margin-left: 8px;
-	border-radius: 5px;
+	border-radius: 5px
 }
+
 #workspaces button {
     padding: 5px 8px;
     color: #c0caf5;
 }
 
 #workspaces button.focused {
-    color: #24283b;
-    background-color: #7aa2f7;
-	border-radius: 5px;
+    color: #7aa2f7;
+	border-radius: 4px;
 }
 
-#workspaces button:hover {
-	background-color: #7dcfff;
-	color: #24283b;
-	border-radius: 5px;
+#workspaces button.persistent {
+    color: #414868;
+	border-radius: 4px;
 }
 
-#tray, #custom-music, #clock, #battery, #pulseaudio, #backlight {
-	background-color: #24283b;
+#tray, #network, #backlight, #pulseaudio, #battery, #clock {
+	border-bottom: 2px solid #414868;
+	border-top: 2px solid #414868;
+	background-color: #1a1b26;
+	color: #c0caf5;
 	padding: 5px 8px;
 	margin-bottom: 8px;
 }
 
-#clock {
-	color: #7dcfff;
-}
-
-#battery {
-	color: #b48ead;
-}
-
-#battery.charging {
-	color: #b48ead;
-}
-
-#battery.warning:not(.charging) {
-    background-color: #f7768e;
-    color: #24283b;
+#network {
+	color: #f7768e;
 }
 
 #backlight {
 	color: #9ece6a;
 }
 
-#custom-music {
-	color: #f7768e;
-	border-radius: 5px 0px 0px 5px;
-}
-
-#tray {
-	border-radius: 0px 5px 5px 0px;
-    margin-right: 8px;
-}
-
 #pulseaudio {
 	color: #e0af68;
 }
+
+#battery {
+	color: #bb9af7;
+}
+
+#clock {
+	color: #7aa2f7;
+	border-radius: 0px 3px 3px 0px;
+    margin-right: 8px;
+	border-right: 2px solid #414868;
+}
+
+#tray {
+	border-radius: 5px 0px 0px 3px;
+	border-left: 2px solid #414868;
+}