From 6ef0786cae5055986d96024e92162899803f89df Mon Sep 17 00:00:00 2001
From: pika <pika@team-pieck.de>
Date: Thu, 22 May 2025 12:08:01 +0200
Subject: [PATCH] wip

---
 install.sh | 97 +++++++++---------------------------------------------
 1 file changed, 16 insertions(+), 81 deletions(-)

diff --git a/install.sh b/install.sh
index 05f585d..d25472e 100755
--- a/install.sh
+++ b/install.sh
@@ -82,31 +82,31 @@ __pre_stow__() {
 
 askThings() {
   if [ ! -d ./dotfiles/.config/tmux/ ] && [ ! -d ./dotfiles/.config/zellij/ ]; then
-    choose askMultiPlexer "Choose a menu" tmux zellij none </dev/tty
+    choose plexer "Choose a menu" tmux zellij none </dev/tty
     # read -r askMultiPlexer </dev/tty
   fi
 
   if [ ! -d ./dotfiles/.config/rofi/ ] && [ ! -d ./dotfiles/.config/tofi/ ]; then
-    choose "Choose a menu" rofi tofi none </dev/tty
+    choose menu "Choose a menu" rofi tofi none </dev/tty
     # read -r askMenu </dev/tty
   fi
 
   if [ ! -d ./dotfiles/.config/yazi/ ] && [ ! -d ./dotfiles/.config/lf/ ] && [ ! -d ./dotfiles/.config/ranger/ ]; then
-    choose "Choose a cli filemanager" yazi ranger lf </dev/tty
+    choose filemgr "Choose a cli filemanager" yazi ranger lf </dev/tty
     # read -r askFilemgr </dev/tty
   fi
 
-  if $arch; then
-    if [ ! -d ./dotfiles/.config/waybar/ ] && [ ! -d ./dotfiles/.config/gBar/ ] && [ ! -d ./dotfiles/.config/hyprpanel/ ]; then
-      choose "Choose a bar provider" waybar gbar hyprpanel </dev/tty
+  if [ ! -d ./dotfiles/.config/waybar/ ] && [ ! -d ./dotfiles/.config/gBar/ ] && [ ! -d ./dotfiles/.config/hyprpanel/ ]; then
+    if $arch; then
+      choose bar "Choose a bar provider" waybar gbar hyprpanel </dev/tty
       # read -r askBar </dev/tty
+    else
+      choose bar "Choose a bar provider" waybar gbar </dev/tty
     fi
-  else
-    choose "Choose a bar provider" waybar gbar </dev/tty
   fi
 
   if [ ! -d ./dotfiles/.config/foot/ ] && [ ! -d ./dotfiles/.config/ghostty/ ] && [ ! -d ./dotfiles/.config/alacritty/ ] && [ ! -d ./dotfiles/.config/kitty/ ]; then
-    choose "Choose a Terminal config" alacritty foot ghostty kitty </dev/tty
+    choose terminal "Choose a Terminal config" alacritty foot ghostty kitty </dev/tty
     # read -r askTerminal </dev/tty
   fi
 
@@ -118,8 +118,8 @@ askThings() {
   # read -r askOptional </dev/tty
 
   if [ ! -d "$HOME/.config/nvim" ]; then
-    choose "Do you also want to install a neovim config?" default mini astro none
-    read -r askNvim </dev/tty
+    choose askNvim "Do you also want to install a neovim config?" default mini astro none </dev/tty
+    # read -r askNvim </dev/tty
   fi
 
 }
@@ -176,76 +176,11 @@ cloneDots() {
 
 __validate__() {
   if askThings; then
-    case "$askMultiPlexer" in
-    tmux)
-      cloneDots "tmux"
-      plexer="tmux"
-      ;;
-    zellij)
-      cloneDots "zellij"
-      plexer="zellij"
-      ;;
-    esac
-
-    case "$askMenu" in
-    rofi)
-      cloneDots "rofi"
-      menu="rofi"
-      ;;
-    tofi)
-      cloneDots "tofi"
-      menu="tofi"
-      ;;
-    esac
-
-    case "$askFilemgr" in
-    yazi)
-      cloneDots "yazi"
-      filemgr="yazi"
-      ;;
-    ranger)
-      cloneDots "ranger"
-      filemgr="ranger"
-      ;;
-    lf)
-      cloneDots "lf"
-      filemgr="lf"
-      ;;
-    esac
-
-    case "$askBar" in
-    waybar)
-      cloneDots "waybar"
-      bar="waybar"
-      ;;
-    gbar)
-      cloneDots "gBar"
-      bar="gBar"
-      ;;
-    hyprpanel)
-      cloneDots "hyprpanel"
-      bar="hyprpanel"
-      ;;
-    esac
-
-    case "$askTerminal" in
-    ghostty)
-      cloneDots "ghostty"
-      terminal="ghostty"
-      ;;
-    kitty)
-      cloneDots "kitty"
-      terminal="kitty"
-      ;;
-    alacritty)
-      cloneDots "alacritty"
-      terminal="alacritty"
-      ;;
-    foot)
-      cloneDots "foot"
-      terminal="foot"
-      ;;
-    esac
+    [[ -n "$plexer" ]] && cloneDots "$plexer"
+    [[ -n "$menu" ]] && cloneDots "$menu"
+    [[ -n "$filemgr" ]] && cloneDots "$filemgr"
+    [[ -n "$bar" ]] && cloneDots "$bar"
+    [[ -n "$terminal" ]] && cloneDots "$terminal"
 
     case "$askNvim" in
     default)