4 files changed, 21 insertions, 63 deletions
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index ab80b30..dbff9e5 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -5,8 +5,6 @@ set $down j
 set $up k
 set $right l
 
-set $menu wmenu
-
 set $out1 -
 set $out2 -
 
@@ -21,8 +19,28 @@ set $ws08 8
 set $ws09 9
 set $ws10 10
 
+set $base00 #1d2021
+set $base01 #3c3836
+set $base02 #504945
+set $base03 #665c54
+set $base04 #bdae93
+set $base05 #d5c4a1
+set $base06 #ebdbb2
+set $base07 #fbf1c7
+set $base08 #fb4934
+set $base09 #fe8019
+set $base0A #fabd2f
+set $base0B #b8bb26
+set $base0C #8ec07c
+set $base0D #83a598
+set $base0E #d3869b
+set $base0F #d65d0e
+
 include ~/.config/sway/config.d/*
 
+set $menu wmenu -i -f'monospace 12' -n$base06 -N$base00 -S$base00 -s$base09 -m$base06 -M$base0C
+set $menu-run wmenu-run -i -f'monospace 12' -n$base06 -N$base00 -S$base00 -s$base09 -m$base06 -M$base0C
+
 # Property              Border  BG      Text    Indicator Child Border
 client.focused          $base05 $base0D $base00 $base0D $base0D
 client.focused_inactive $base01 $base01 $base05 $base03 $base01
@@ -98,7 +116,7 @@ bindsym Print exec slurp | grim -g - - | wl-copy --type image/png
 bindsym $mod+Print exec /usr/share/sway/scripts/grimshot --notify save area
 
 bindsym $mod+space exec j4-dmenu-desktop --dmenu="$menu" --term=$TERMINAL
-bindsym $mod+shift+space exec wmenu-run | $menu | xargs -r swaymsg exec --
+bindsym $mod+shift+space exec $menu-run
 
 bindsym $mod+v exec (cliphist list | $menu -l 10 || (cliphist list | head -n1)) | cliphist decode | wl-copy
 bindsym $mod+Shift+v exec cliphist list | $menu -l 10 | cliphist delete
diff --git a/sway/.config/sway/config.d/10-gruvbox.conf b/sway/.config/sway/config.d/10-gruvbox.conf
deleted file mode 100644
index 6929625..0000000
--- a/sway/.config/sway/config.d/10-gruvbox.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-set $base00 #1d2021
-set $base01 #3c3836
-set $base02 #504945
-set $base03 #665c54
-set $base04 #bdae93
-set $base05 #d5c4a1
-set $base06 #ebdbb2
-set $base07 #fbf1c7
-set $base08 #fb4934
-set $base09 #fe8019
-set $base0A #fabd2f
-set $base0B #b8bb26
-set $base0C #8ec07c
-set $base0D #83a598
-set $base0E #d3869b
-set $base0F #d65d0e
diff --git a/wayland/.local/bin/wmenu b/wayland/.local/bin/wmenu
deleted file mode 100755
index 0f5c0f1..0000000
--- a/wayland/.local/bin/wmenu
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-exec $(command -pv wmenu) -i -f 'monospace 12' \
-	-n"#$BASE16_COLOR_06_HEX" \
-	-N"#$BASE16_COLOR_00_HEX" \
-	-S"#$BASE16_COLOR_00_HEX" \
-	-s"#$BASE16_COLOR_09_HEX" \
-	-m"#$BASE16_COLOR_06_HEX" \
-	-M"#$BASE16_COLOR_0C_HEX" \
-	"$@"
diff --git a/wayland/.local/bin/wmenu-run b/wayland/.local/bin/wmenu-run
deleted file mode 100755
index fd1f669..0000000
--- a/wayland/.local/bin/wmenu-run
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-cache_dir="${XDG_CACHE_HOME:-"$HOME/.cache"}"
-cache="$cache_dir/wmenu-run"
-
-uptodate() {
-	IFS=:
-	for path in $PATH; do
-		if test "$path" -nt "$cache"; then
-			return 1
-		fi
-	done
-
-	return 0
-}
-
-get_bin() {
-	IFS=:
-	for path in $PATH; do
-		for bin in "$path"/*; do
-			if [ -x "$bin" ]; then
-				echo "${bin##*/}"
-			fi
-		done
-	done
-}
-
-[ ! -e "$cache_dir" ] && mkdir -p "$cache_dir"
-
-if [ ! -e "$cache" ] || ! uptodate; then
-	get_bin | sort -u | tee "$cache" | sway-menu
-else
-	cat "$cache"
-fi