diff --git a/docs/md/modules.md b/docs/md/modules.md index bacc6bd..60a0e19 100644 --- a/docs/md/modules.md +++ b/docs/md/modules.md @@ -144,7 +144,6 @@ bash ~/Dotfiles/setup/install-modules.sh | `timeshift` | system snapshot and backup with autosnap | | `zfs` | zfs-dkms kernel module | | `wprs` | Wayland proxy for remote sessions (wprs-git, AUR) | -| `plymouth` | boot splash — bundled skull logo and spinner | | `plymouth-custom` | boot splash with a user-supplied image | diff --git a/setup/generate-answerfile.sh b/setup/generate-answerfile.sh index 2bf878b..8269a2e 100644 --- a/setup/generate-answerfile.sh +++ b/setup/generate-answerfile.sh @@ -219,7 +219,7 @@ if [[ "$AF_RUN_TUI" == "true" ]]; then # BEGIN GENERATED MODULES: module-checklist AF_APPS=$(dialog --backtitle "$BACKTITLE" \ --title " Applications " \ - --checklist "Optional applications — installed after base components:" 40 76 80 \ + --checklist "Optional applications — installed after base components:" 40 76 79 \ "ollama" "ollama local LLM runner and API server" off \ "llama-cpp" "llama-cpp standalone LLM inference CLI and server" off \ "open-webui" "open-webui browser UI for Ollama and LLM backends" off \ @@ -252,7 +252,6 @@ if [[ "$AF_RUN_TUI" == "true" ]]; then "timeshift" "timeshift system snapshot and backup with autosnap" off \ "zfs" "zfs zfs-dkms kernel module" off \ "wprs" "wprs Wayland proxy for remote sessions (wprs-git, AUR)" off \ - "plymouth" "plymouth boot splash — bundled skull logo and spinner" on \ "plymouth-custom" "plymouth-custom boot splash with a user-supplied image" off \ "steam" "steam Steam gaming platform" off \ "vesktop" "vesktop Discord client with Vencord theme" off \ diff --git a/setup/modules.conf b/setup/modules.conf index 8a63a52..2a8cb9a 100644 --- a/setup/modules.conf +++ b/setup/modules.conf @@ -49,8 +49,7 @@ localtunnel|system|expose localhost over a public URL|off| timeshift|system|system snapshot and backup with autosnap|off| zfs|system|zfs-dkms kernel module|off| wprs|system|Wayland proxy for remote sessions (wprs-git, AUR)|off| -plymouth|system|boot splash — bundled skull logo and spinner|on|plymouth-custom -plymouth-custom|system|boot splash with a user-supplied image|off|plymouth +plymouth-custom|system|boot splash with a user-supplied image|off| # ── Gaming ──────────────────────────────────────────────────────────────────── steam|gaming|Steam gaming platform|off| diff --git a/setup/tui-install.sh b/setup/tui-install.sh index d6bad71..7599f0d 100755 --- a/setup/tui-install.sh +++ b/setup/tui-install.sh @@ -195,7 +195,6 @@ count_steps() { [[ "$a" == *"timeshift"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"zfs"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"wprs"* ]] && TOTAL=$(( TOTAL + 1 )) - [[ "$a" == *"plymouth"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"plymouth-custom"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"steam"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"vesktop"* ]] && TOTAL=$(( TOTAL + 1 )) @@ -480,7 +479,6 @@ else "timeshift" "timeshift system snapshot and backup with autosnap" off \ "zfs" "zfs zfs-dkms kernel module" off \ "wprs" "wprs Wayland proxy for remote sessions (wprs-git, AUR)" off \ - "plymouth" "plymouth boot splash — bundled skull logo and spinner" on \ "plymouth-custom" "plymouth-custom boot splash with a user-supplied image" off \ "steam" "steam Steam gaming platform" off \ "vesktop" "vesktop Discord client with Vencord theme" off \ @@ -594,7 +592,6 @@ if ! $ANSWERFILE_MODE; then [[ "$SELECTED_APPS" == *"timeshift"* ]] && SUMMARY+=" ✦ timeshift\n" [[ "$SELECTED_APPS" == *"zfs"* ]] && SUMMARY+=" ✦ zfs\n" [[ "$SELECTED_APPS" == *"wprs"* ]] && SUMMARY+=" ✦ wprs\n" - [[ "$SELECTED_APPS" == *"plymouth"* ]] && SUMMARY+=" ✦ plymouth\n" [[ "$SELECTED_APPS" == *"plymouth-custom"* ]] && SUMMARY+=" ✦ plymouth-custom\n" [[ "$SELECTED_APPS" == *"steam"* ]] && SUMMARY+=" ✦ steam\n" [[ "$SELECTED_APPS" == *"vesktop"* ]] && SUMMARY+=" ✦ vesktop\n" @@ -664,7 +661,7 @@ count_steps "$COMPONENTS" "$DE" "$SELECTED_APPS" [[ "$COMPONENTS" == *"core"* ]] && run_module "Core Packages" "$MODULES/core-packages.sh" [[ "$COMPONENTS" == *"svc"* ]] && run_module "Core Services" "$MODULES/core.sh" [[ "$COMPONENTS" == *"shell"* ]] && run_module "Shell Setup" "$MODULES/shell-setup.sh" -[[ "$COMPONENTS" == *"plymouth"* ]] && run_module "Plymouth" "$MODULES/optional-Modules/plymouth.sh" +[[ "$COMPONENTS" == *"plymouth"* ]] && run_module "Plymouth" "$APPS/plymouth.sh" # Route the single selected DE value to its corresponding install script. # "none" is the skip sentinel — no case branch matches it intentionally. @@ -687,14 +684,6 @@ fi # module script will be caught by run_module()'s error handling rather than # silently skipped — 'bash "$script"' will exit non-zero if the file is absent. # BEGIN GENERATED MODULES: module-conflicts -if [[ "$SELECTED_APPS" == *"plymouth"* && "$SELECTED_APPS" == *"plymouth-custom"* ]]; then - warn "plymouth and plymouth-custom are mutually exclusive — skipping plymouth-custom" - SELECTED_APPS="${SELECTED_APPS/plymouth-custom/}" -fi -if [[ "$SELECTED_APPS" == *"plymouth-custom"* && "$SELECTED_APPS" == *"plymouth"* ]]; then - warn "plymouth-custom and plymouth are mutually exclusive — skipping plymouth" - SELECTED_APPS="${SELECTED_APPS/plymouth/}" -fi # END GENERATED MODULES: module-conflicts # BEGIN GENERATED MODULES: module-dispatch [[ "$SELECTED_APPS" == *"ollama"* ]] && run_module "ollama" "$APPS/ollama.sh" @@ -729,7 +718,6 @@ fi [[ "$SELECTED_APPS" == *"timeshift"* ]] && run_module "timeshift" "$APPS/timeshift.sh" [[ "$SELECTED_APPS" == *"zfs"* ]] && run_module "zfs" "$APPS/zfs.sh" [[ "$SELECTED_APPS" == *"wprs"* ]] && run_module "wprs" "$APPS/wprs.sh" -[[ "$SELECTED_APPS" == *"plymouth"* ]] && run_module "plymouth" "$APPS/plymouth.sh" [[ "$SELECTED_APPS" == *"plymouth-custom"* ]] && run_module "plymouth-custom" "$APPS/plymouth-custom.sh" [[ "$SELECTED_APPS" == *"steam"* ]] && run_module "steam" "$APPS/steam.sh" [[ "$SELECTED_APPS" == *"vesktop"* ]] && run_module "vesktop" "$APPS/vesktop.sh"