From 4ba93cafa4d50af24ded2e08d05c0b240670b563 Mon Sep 17 00:00:00 2001
From: tavo <tavo@tavo.one>
Date: Fri, 5 Sep 2025 15:19:52 -0600
Subject: [PATCH] sway menu

---
 packages/flatpak/list.yml            |  2 +
 scripts/menu/menu                    | 84 +++++++++++++++-------------
 scripts/setup/setup-flatpak-packages | 16 ++++--
 sway/config                          |  4 +-
 4 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/packages/flatpak/list.yml b/packages/flatpak/list.yml
index 4835b4b..2c91991 100644
--- a/packages/flatpak/list.yml
+++ b/packages/flatpak/list.yml
@@ -11,3 +11,5 @@ steam: com.valvesoftware.Steam
 flatseal: com.github.tchx84.Flatseal
 loupe: org.gnome.Loupe
 citations: org.gnome.World.Citations
+libreoffice: org.libreoffice.LibreOffice
+qbittorrent: org.qbittorrent.qBittorrent
diff --git a/scripts/menu/menu b/scripts/menu/menu
index de8af58..fb99f77 100755
--- a/scripts/menu/menu
+++ b/scripts/menu/menu
@@ -3,7 +3,7 @@ MENU_BACKEND="${MENU_BACKEND:-menu_bemenu}"
 
 # Configuration
 font="JetbrainsMono"
-font_size="11"
+font_size="10"
 col_white="#ebdbb2" # White
 col_nb="#1e2326"    # Normal background
 col_nf="#374145"    # Normal foreground
@@ -11,11 +11,11 @@ col_sb="#7fbbb3"    # Selected background
 col_sf="#1e2326"    # Selected foreground
 
 _help() {
-	printf "Usage: menu [run/dmenu/pass] [prompt]\nDefault backend: %s\n" "$MENU_BACKEND"
+  printf "Usage: menu [run/dmenu/pass] [prompt]\nDefault backend: %s\n" "$MENU_BACKEND"
 }
 
 menu_bemenu() {
-bemenu$BRUN \
+  bemenu$BRUN \
     --no-exec \
     -i \
     -c \
@@ -24,25 +24,25 @@ bemenu$BRUN \
     -B 2 \
     --cw 1 \
     --tb $col_sb \
-    --tf $col_sf  \
-    --fb $col_nb  \
-    --ff $col_nf  \
-    --cb $col_nb  \
+    --tf $col_sf \
+    --fb $col_nb \
+    --ff $col_nf \
+    --cb $col_nb \
     --cf $col_white \
-    --nb $col_nb  \
-    --nf $col_nf  \
-    --hb $col_sb  \
-    --hf $col_sf  \
-    --ab $col_nb  \
-    --af $col_nf  \
-    --bdr $col_sb  \
-    --fn "$font $font_size"  \
+    --nb $col_nb \
+    --nf $col_nf \
+    --hb $col_sb \
+    --hf $col_sf \
+    --ab $col_nb \
+    --af $col_nf \
+    --bdr $col_sb \
+    --fn "$font $font_size" \
     -p "$PROMPT" \
     $BPASS
 }
 
 menu_dmenu() {
-dmenu$DRUN \
+  dmenu$DRUN \
     -i \
     -l 10 \
     -nb $col_nb \
@@ -55,18 +55,18 @@ dmenu$DRUN \
 }
 
 menu_tofi() {
-tofi$TRUN \
+  tofi$TRUN \
     --prompt-text "$PROMPT"
 }
 
 menu_fzf() {
-fzf \
+  fzf \
     --cycle \
     --reverse
 }
 
 menu_wofi() {
-wofi $WRUN \
+  wofi $WRUN \
     -i \
     --prompt "$PROMPT" \
     $WPASS
@@ -74,24 +74,30 @@ wofi $WRUN \
 
 MODE="$1" PROMPT="$2"
 case "$MODE" in
-	run)
-		BRUN="-run"
-		DRUN="_run"
-		TRUN="-run"
-		FRUN=""
-		WRUN="--show drun -I"
-		$MENU_BACKEND ;;
-	dmenu)
-		BRUN=""
-		DRUN=""
-		TRUN=""
-		FRUN=""
-		WRUN="--show dmenu"
-		$MENU_BACKEND ;;
-	pass)
-		BPASS="-x"
-		DPASS="-P"
-		WPASS="-P"
-		$MENU_BACKEND ;;
-	*) _help ; exit 0;;
+run)
+  BRUN="-run"
+  DRUN="_run"
+  TRUN="-run"
+  FRUN=""
+  WRUN="--show drun -I"
+  $MENU_BACKEND
+  ;;
+dmenu)
+  BRUN=""
+  DRUN=""
+  TRUN=""
+  FRUN=""
+  WRUN="--show dmenu"
+  $MENU_BACKEND
+  ;;
+pass)
+  BPASS="-x"
+  DPASS="-P"
+  WPASS="-P"
+  $MENU_BACKEND
+  ;;
+*)
+  _help
+  exit 0
+  ;;
 esac
diff --git a/scripts/setup/setup-flatpak-packages b/scripts/setup/setup-flatpak-packages
index 6589926..a90f15d 100755
--- a/scripts/setup/setup-flatpak-packages
+++ b/scripts/setup/setup-flatpak-packages
@@ -3,12 +3,16 @@ EXPORTS_BIN_PREFIX="$HOME/.local/bin"
 FLATPAK_BIN_PREFIX="/var/lib/flatpak/exports/bin"
 FLATPAK_LIST="$XDG_CONFIG_HOME"/packages/flatpak/list.yml
 
+if ! [ -d "$EXPORTS_BIN_PREFIX" ]; then
+  mkdir -p "$EXPORTS_BIN_PREFIX"
+fi
+
 while read line; do
-	bin="${line%%:*}"
-	app="${line##*:}"
-	app="${app##* }"
-	ln -sf "$FLATPAK_BIN_PREFIX"/"$app" "$EXPORTS_BIN_PREFIX"/"$bin"
-	app_list="$app_list $app"
-done < "$FLATPAK_LIST"
+  bin="${line%%:*}"
+  app="${line##*:}"
+  app="${app##* }"
+  ln -sf "$FLATPAK_BIN_PREFIX"/"$app" "$EXPORTS_BIN_PREFIX"/"$bin"
+  app_list="$app_list $app"
+done <"$FLATPAK_LIST"
 
 flatpak install -y $app_list
diff --git a/sway/config b/sway/config
index 1a879fc..35fdb45 100644
--- a/sway/config
+++ b/sway/config
@@ -36,7 +36,7 @@ set $filemgr thunar
 set $browser firefox
 set $browserh firefox-hardened
 # -
-set $menu wofi --show drun -I
+set $menu exec $(~/.config/scripts/menu/menu run "Run:")
 set $passmgr ~/.config/scripts/sway/swaypass
 set $passotp ~/.config/scripts/sway/swayotp
 # -
@@ -121,7 +121,7 @@ font pango:JetBrainsMono Medium 8
 
 bar {
     position bottom
-    font pango:JetBrainsMono Bold 9
+    font pango:JetBrainsMono Bold 8
     status_command ~/.config/scripts/sway/swaystatus
     tray_padding 4