Refactor, remove unnecessary modules, & set solid background

3 files changed, 12 insertions, 53 deletions

diff --git a/config.jsonc b/config.jsonc
index ec463cc..7b20d08 100644
--- a/config.jsonc
+++ b/config.jsonc
@@ -1,23 +1,19 @@
 {
-	"output": ["Microstep MAG274QRF-QD CA8A391600566", "eDP-1"],
+	"output": ["DP-1", "eDP-1"],
 	"position": "top",
 	"include": ["~/.config/waybar/modules.jsonc"],
 	"reload_style_on_change": true,
 
 	"modules-left": [
-		"custom/apps",
-		"sway/workspaces",
-		"wlr/taskbar"
-	],
-
-	"modules-center": [
-		"mpris"
+		"custom/menu",
+		"sway/workspaces"
 	],
 
 	"modules-right": [
-		"cava",
 		"cpu",
 		"memory",
+		"battery",
+		"bluetooth",
 		"network",
 		"wireplumber",
 		"clock#calendar",
diff --git a/modules.jsonc b/modules.jsonc
index d039d5b..c6783c7 100644
--- a/modules.jsonc
+++ b/modules.jsonc
@@ -3,8 +3,6 @@
 		"format" : "󰕰",
 		"tooltip": false,
 		"on-click": "pkill nwggrid || nwggrid"
-		// "on-click": "wmenu-run -p 'Run:' -f 'Hack Nerd Font 14' -M 00ffff -m 000000 -N 000000 -n aaaaaa -S 00ffff -s 000000"
-
 	},
 
 	"custom/menu": {
@@ -32,10 +30,6 @@
 		"tooltip-format": "{app}: {title}"
 	},
 
-	"niri/workspaces": {
-		"format": "{value}"
-	},
-
 	"clock": {
 		"format": "{:%R} 󱑊 ",
 		"format-alt": "{:%I:%M %p} 󱑊 ",
@@ -121,12 +115,7 @@
 	"tray": {
 		"spacing": 8,
 		"icon-size": 16,
-		"show-passive-items": true,
-		"icons": {
-			"steam": "/usr/share/icons/Papirus/64x64/apps/steam.svg",
-			"net.lutris.Lutris": "/usr/share/icons/Papirus/64x64/apps/lutris.svg",
-			"zeal": "/usr/share/icons/Papirus/64x64/apps/zeal.svg"
-		}
+		"show-passive-items": true
 	},
 
 	"wlr/taskbar": {
@@ -148,7 +137,7 @@
 
 	"network": {
 		"format": "{ifname}",
-		"format-disabled": "󰖪",      // i.e. aeroplane mode
+		"format-disabled": "󰖪",
 		"format-wifi": "Online  ",
 		"format-ethernet": "{ipaddr}/{cidr}  ",
 		"format-disconnected": "offline 󰤮",
@@ -206,30 +195,5 @@
 		"status-icons": {
 			"paused": "󰏤"
 		}
-		// "ignored-players": ["firefox"]
-	},
-	"cava": {
-        // "cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
-        "framerate": 30,
-        "autosens": 1,
-        "sensitivity": 100,
-        "bars": 14,
-        "lower_cutoff_freq": 50,
-        "higher_cutoff_freq": 10000,
-        "hide_on_silence": false,
-        // "format_silent": "quiet",
-        "method": "pulse",
-        "source": "auto",
-        "stereo": true,
-        "reverse": false,
-        "bar_delimiter": 0,
-        "monstercat": false,
-        "waves": false,
-        "noise_reduction": 0.77,
-        "input_delay": 2,
-        "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ],
-        "actions": {
-                   "on-click-right": "mode"
-                   }
-    }
+	},
 }
diff --git a/style.css b/style.css
index 07cbc94..5bd6e07 100644
--- a/style.css
+++ b/style.css
@@ -25,13 +25,13 @@
 /* Bar */
 window#waybar {
 	color: @fg;
-    /*
-	background: rgba(0,0,0,0.8);
-	border-top: 1px solid rgba(255,255,255,0.3);
-	*/
+	background: black;
+	border-bottom: 1px solid #444
 
+	/*
 	background: transparent;
 	border: none;
+	*/
 }
 
 window#waybar.hidded {
@@ -78,7 +78,6 @@ label:hover {
 }
 */
 
-
 /* WORKSPACES & TASKBAR*/
 #workspaces button,
 #taskbar button {