v3-revamp-fedora

fedora/fedora-full.sh

@@ -19,7 +19,7 @@ install_packages() { sudo dnf install -y "$@"; }
 is_package_installed() { rpm -q "$@" &>/dev/null; }
 
 # Run minimal first
-bash "$SCRIPT_DIR/fedora-minimal.sh"
+source "$SCRIPT_DIR/fedora-minimal.sh"
 
 # Add extra packages
 install_packages arandr catfish galculator NetworkManager network-manager-applet \

fedora/fedora-workstation.sh

@@ -1,82 +1,51 @@
-#!/bin/bash
+##!/bin/bash
 set -euo pipefail
 
-##########################
-# Color helpers (printf-safe, no tput)
-##########################
-RED="\033[0;31m"
-GREEN="\033[0;32m"
-YELLOW="\033[0;33m"
-CYAN="\033[0;36m"
-GRAY="\033[0;37m"
-BOLD="\033[1m"
-RESET="\033[0m"
-
-# Disable colors if output is not a terminal
-if [ ! -t 1 ]; then
-    RED="" GREEN="" YELLOW="" CYAN="" GRAY="" BOLD="" RESET=""
-fi
-
-say_red()    { printf "\n"; printf "%b%s%b\n" "$RED" "$*" "$RESET"; }
-say_green()    { printf "\n"; printf "%b%s%b\n" "$GREEN" "$*" "$RESET"; }
-say_yellow()   { printf "\n"; printf "%b%s%b\n" "$YELLOW" "$*" "$RESET"; }
-say_cyan()     { printf "\n"; printf "%b%s%b\n" "$CYAN" "$*" "$RESET"; }
-say_gray()     { printf "\n"; printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; }
-say_bold()     { printf "\n"; printf "%b%s%b\n" "$BOLD" "$*" "$RESET"; }
-
-##########################
-# Use exported variables from main detection script
-##########################
-OS="${DETECTED_OS}"
-DDE="${DETECTED_DE:-}"
+# Map the exported variables to your local names with fallbacks to satisfy set -u
+OS="${DETECTED_OS:-fedora}"
 DE="${SELECTED_DE:-none}"
 TWM="${SELECTED_TWM:-none}"
-INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
+INSTALL_LEVEL="${INSTALL_LEVEL:-full}"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-##########################
-# Helper functions
-##########################
-install_packages() { sudo dnf install -y "$@"; }
-is_package_installed() { rpm -q "$@" &>/dev/null; }
-
-say_yellow "Starting Workstation setup..."
+echo
+color_cyan "Starting Workstation setup..."
+echo
 
 # Run full first
-bash "$SCRIPT_DIR/fedora-full.sh"
+source "$SCRIPT_DIR/fedora-full.sh"
 
 # Add extra packages
-install_packages git libreoffice
-# gitahead-git
+install_packages libreoffice
 
 # editors
-install_packages konsole
+# install_packages 
 # temp removed packages:
-# sublime-text-4 vscodium
+# sublime-text-4 
 flatpak install -y flathub com.vscodium.codium
 
-#internet
-# install_packages 
+# internet
+install_packages google-chrome-stable
 # temp removed packages
-# google-chrome discord firefox insync brave-bin
+# discord firefox insync brave-bin
 
-#theming
+# theming
 # variety
 
-#media
-install_packages mpv
+# media
+install_packages mpv flameshot
 # temp removed packages
-# vlc gimp inkscape spotify lollypop mpv-full mpv-git flameshot-git
+# vlc gimp inkscape spotify lollypop
 
-#shells
+# shells
 install_packages zsh zsh-syntax-highlighting 
 # temp removed packages
 # fish oh-my-zsh-git zsh-completions
 
-#system-tools
-install_packages @development-tools git curl wget cmake ninja-build pkgconf-pkg-config
+# system-tools
+install_packages @development-tools wget cmake ninja-build pkgconf-pkg-config
 
-#tools
+# tools
 install_packages system-config-printer system-config-printer-applet system-config-printer-libs ripgrep meld btop htop hwinfo lshw 
 # temp removed packages
 # wttr