bootleg-stow

@@ -75,7 +75,7 @@ checkconflict() {
 		error "Could not read directory: $1" 2
 	fi
 	# Get our list of files
-	local files="$(find "$1" ! -name "*.swp" -type f -o -type l)"
+	local files="$(find "$1" -type f -o -type l)"
 	local directories="$(find "$1" -type d)"
 	local -a conflict
 	# Iterate over them

sericea/.config/waybar/config

@@ -1,10 +1,9 @@
-[{
+{
 	"layer": "top",
 	"height": 40,
-	"id": "top",
 	"modules-left": ["sway/workspaces", "sway/mode"],
-	"modules-center": ["sway/window"],
-	"modules-right": ["tray"],
+	"modules-center": ["clock"],
+	"modules-right": ["network", "pulseaudio", "backlight", "battery", "tray", "mpris", "idle_inhibitor"],
 	"sway/workspaces": {
 		"all-outputs": false,
 		"disable-scroll": true,
@@ -21,30 +20,22 @@
 			"10": ["eDP-1", "DP-2"]
 		}
 	},
-	"sway/window": {
+	"idle_inhibitor": {
+		"format": "{icon}",
+		"format-icons": {
+			"activated": "",
+			"deactivated": ""
+		}
 	},
 	"tray": {
 		"icon-size": 16,
 		"spacing": 10
-	}
-},
-{
-	"id": "bottom",
-	"layer": "top",
-	"position": "bottom",
-	"height": 40,
-	"modules-left": ["idle_inhibitor", "gamemode", "mpris"],
-	"modules-center": ["clock"],
-	"modules-right": ["network", "pulseaudio", "backlight", "battery"],
+	},
 	"clock": {
 		"format": "{:%a %b %d %I:%M %p}",
 		"format-alt": "{:%Y-%m-%d}",
 		"tooltip": false
 	},
-	"network": {
-		"interval": 1,
-		"format": " {bandwidthUpBytes}  {bandwidthDownBytes}"
-	},
 	"battery": {
 		"states": {
 			"good": 100,
@@ -60,35 +51,9 @@
 		"format": "{icon} {percent}%",
 		"format-icons": ["", ""]
 	},
-	"idle_inhibitor": {
-		"format": "{icon}",
-		"format-icons": {
-			"activated": "",
-			"deactivated": ""
-		}
-	},
-	"gamemode": {
-		"hide-not-running": false,
-		"format": "{glyph}",
-		"glyph": "",
-		"use-icon": false,
-		"icon-spacing": 0,
-		"icon-size": 0
-	},
-	"pulseaudio": {
-		"scroll-step": 5,
-		"format": "{icon} {volume}%",
-		"format-icons": {
-			"default": ["", "", ""]
-		},
-		"on-scroll-up": "/usr/libexec/sway/volume-helper --limit 100 --increase 5",
-		"on-scroll-down": "/usr/libexec/sway/volume-helper --limit 100 --decrease 5",
-		"on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle && /usr/libexec/sway/volume-helper"
-	},
 	"mpris": {
 		"interval": 1,
-		"max-length": 100,
-		"format": "{player_icon} - {dynamic}",
+		"format": "{player_icon}",
 		"ignored-players": [
 			"firefox"
 		],
@@ -100,5 +65,19 @@
 			"paused": "⏸",
 			"stopped": "⏹"
 		}
+	},
+	"network": {
+		"interval": 1,
+		"format": " {bandwidthUpBytes}  {bandwidthDownBytes}"
+	},
+	"pulseaudio": {
+		"scroll-step": 5,
+		"format": "{icon} {volume}%",
+		"format-icons": {
+			"default": ["", "", ""]
+		},
+		"on-scroll-up": "/usr/libexec/sway/volume-helper --limit 100 --increase 5",
+		"on-scroll-down": "/usr/libexec/sway/volume-helper --limit 100 --decrease 5",
+		"on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle && /usr/libexec/sway/volume-helper"
 	}
-}]
+}

sericea/.config/waybar/style.css

@@ -8,7 +8,7 @@
 * {
 	border: none;
 	border-radius: 0;
-	font-family: "IBM Plex Sans", "Font Awesome 6 Free", sans-serif;
+	font-family: "IBM Plex Sans Medium";
 	font-size: 13px;
 }
 
@@ -48,9 +48,6 @@ window#waybar {
 }
 
 /* widgets */
-#window {
-	color: #ebdbb2;
-}
 #pulseaudio {
 	padding: 0 1em;
 	color: #ebdbb2;
@@ -72,7 +69,6 @@ window#waybar {
 	color: #504945;
 }
 #network {
-	padding: 0 1em;
 	color: #928374;
 	font-size: 10;
 }
@@ -89,13 +85,6 @@ window#waybar {
 	padding: 0 1em;
 	color: #fabd2f;
 }
-#gamemode {
-	padding: 0 1em;
-	color: #504945;
-}
-#gamemode.running {
-	color: #b8bb26;
-}
 #battery {
 	padding: 0 1em;
 }