v3-revamp-fedora

fedora/fedora-full.sh

@@ -22,11 +22,8 @@ is_package_installed() { rpm -q "$@" &>/dev/null; }
 source "$SCRIPT_DIR/fedora-minimal.sh"
 
 # Add extra packages
-install_packages arandr catfish galculator NetworkManager network-manager-applet \
+# install_packages 
-                NetworkManager-openvpn numlockx pipewire pipewire-alsa pipewire-pulse \
-                wireplumber pavucontrol playerctl gparted xfce4-pulseaudio-plugin xfce4-clipman-plugin
 # temp disabled packages
-# xfce4-indicator-plugin
 
 pause_if_debug
 
@@ -76,37 +73,72 @@ color_green "SDDM theme installer completed successfully!"
 
 pause_if_debug
 
-# Ensure NetworkManager manages all interfaces
-color_yellow "Ensuring NetworkManager service is enabled and running..."
-sudo systemctl enable --now NetworkManager
-
-color_yellow "Setting NetworkManager to globally manage all devices..."
-sudo tee /etc/NetworkManager/conf.d/10-globally-managed-devices.conf > /dev/null <<'EOF'
-[ifupdown]
-managed=true
-
-[keyfile]
-unmanaged-devices=
-EOF
-
-color_yellow "Restarting NetworkManager service..."
-sudo systemctl restart NetworkManager
-
-color_yellow "Waiting for NetworkManager to reconnect..."
-sleep 15
-
-pause_if_debug
-
-# Enable pipewire
-systemctl --user enable pipewire pipewire-pulse wireplumber
-
-pause_if_debug
-
 # replace bashrc
 color_yellow "making backup of bashrc"
 sudo cp -v /etc/skel/.bashrc /etc/skel/.bashrc.starburst
 
 pause_if_debug
 
+# Add workstation repo
+sudo dnf install -y fedora-workstation-repositories
+
+color_cyan "Install Office packages"
+install_packages libreoffice
+
+pause_if_debug
+
+color_cyan "Install editors packages"
+# temp removed packages:
+# sublime-text-4 
+flatpak install -y flathub com.vscodium.codium
+
+pause_if_debug
+
+color_cyan "Install internet packages"
+sudo dnf config-manager setopt google-chrome.enabled=1
+install_packages google-chrome-stable
+# temp removed packages
+# discord firefox insync brave-bin
+
+pause_if_debug
+
+color_cyan "Install theming packages"
+# variety
+
+pause_if_debug
+
+color_cyan "Install media packages"
+install_packages mpv flameshot
+# temp removed packages
+# vlc gimp inkscape spotify lollypop
+
+pause_if_debug
+
+color_cyan "Install shell packages"
+install_packages zsh zsh-syntax-highlighting 
+# temp removed packages
+# fish oh-my-zsh-git zsh-completions
+
+pause_if_debug
+
+color_cyan "Install system-tools"
+install_packages @development-tools wget cmake ninja-build pkgconf-pkg-config
+
+pause_if_debug
+
+color_cyan "Install tools"
+install_packages system-config-printer system-config-printer-applet system-config-printer-libs ripgrep meld btop htop
+# temp removed packages
+# wttr
+
+pause_if_debug
+
 # End of script
 color_green "Full setup completed."
+
+###### TODO
+### autostart flameshot tray icon
+### autostart insync tray icon
+### autostart volumeicon
+### autostart clipboard manager
+### set google chrome as default browser

fedora/fedora-minimal.sh

@@ -56,7 +56,12 @@ install_packages \
     zip gzip p7zip unace unrar xarchiver \
     feh gnome-font-viewer dconf-editor hardinfo2 lsb_release \
     powertop inxi acpi plocate nm-connection-editor \
-    python3-pylint qt6-qtsvg qt6-qtvirtualkeyboard qt6-qtmultimedia
+    python3-pylint qt6-qtsvg qt6-qtvirtualkeyboard qt6-qtmultimedia \
+    arandr catfish galculator NetworkManager network-manager-applet \
+    NetworkManager-openvpn numlockx pipewire pipewire-alsa pipewire-pulse \
+    wireplumber pavucontrol playerctl gparted xfce4-pulseaudio-plugin xfce4-clipman-plugin
+# temp disabled packages
+# xfce4-indicator-plugin
 
 pause_if_debug
 
@@ -100,7 +105,34 @@ pause_if_debug
 # 4. Enable Services
 #------------------------------------------
 color_cyan "Enabling services..."
+
 sudo systemctl enable --now fstrim.timer
 sudo systemctl enable --now chronyd || true
 
+# Ensure NetworkManager manages all interfaces
+color_yellow "Ensuring NetworkManager service is enabled and running..."
+sudo systemctl enable --now NetworkManager
+
+color_yellow "Setting NetworkManager to globally manage all devices..."
+sudo tee /etc/NetworkManager/conf.d/10-globally-managed-devices.conf > /dev/null <<'EOF'
+[ifupdown]
+managed=true
+
+[keyfile]
+unmanaged-devices=
+EOF
+
+color_yellow "Restarting NetworkManager service..."
+sudo systemctl restart NetworkManager
+
+color_yellow "Waiting for NetworkManager to reconnect..."
+sleep 15
+
+pause_if_debug
+
+# Enable pipewire
+systemctl --user enable pipewire pipewire-pulse wireplumber
+
+pause_if_debug
+
 color_green "Fedora Minimal setup completed."

fedora/fedora-workstation.sh

@@ -1,82 +0,0 @@
-##!/bin/bash
-set -euo pipefail
-
-# 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:-full}"
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-echo
-color_cyan "Starting Workstation setup..."
-echo
-
-# Run full first
-source "$SCRIPT_DIR/fedora-full.sh"
-
-# Add workstation repo
-sudo dnf install -y fedora-workstation-repositories
-
-color_cyan "Install Office packages"
-install_packages libreoffice
-
-pause_if_debug
-
-color_cyan "Install editors packages"
-# temp removed packages:
-# sublime-text-4 
-flatpak install -y flathub com.vscodium.codium
-
-pause_if_debug
-
-color_cyan "Install internet packages"
-sudo dnf config-manager setopt google-chrome.enabled=1
-install_packages google-chrome-stable
-# temp removed packages
-# discord firefox insync brave-bin
-
-pause_if_debug
-
-color_cyan "Install theming packages"
-# variety
-
-pause_if_debug
-
-color_cyan "Install media packages"
-install_packages mpv flameshot
-# temp removed packages
-# vlc gimp inkscape spotify lollypop
-
-pause_if_debug
-
-color_cyan "Install shell packages"
-install_packages zsh zsh-syntax-highlighting 
-# temp removed packages
-# fish oh-my-zsh-git zsh-completions
-
-pause_if_debug
-
-color_cyan "Install system-tools"
-install_packages @development-tools wget cmake ninja-build pkgconf-pkg-config
-
-pause_if_debug
-
-color_cyan "Install tools"
-install_packages system-config-printer system-config-printer-applet system-config-printer-libs ripgrep meld btop htop
-# temp removed packages
-# wttr
-
-pause_if_debug
-
-# End of script
-color_green "Workstation setup completed."
-
-pause_if_debug
-
-###### TODO
-### autostart flameshot tray icon
-### autostart insync tray icon
-### autostart volumeicon
-### autostart clipboard manager
-### set google chrome as default browser

main_script.sh

@@ -232,8 +232,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
         echo
         echo "  1) minimal"
         echo "  2) full"
-        echo "  3) workstation"
-        echo "  4) server"
         if ! read -t 15 -rp "Enter choice [1/2/3/4] (default: 1): " choice; then
             choice="1"
         fi
@@ -241,9 +239,7 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
         case "$choice" in
             1|"") INSTALL_LEVEL="minimal"; break ;;
             2) INSTALL_LEVEL="full"; break ;;
-            3) INSTALL_LEVEL="workstation"; break ;;
+            *) echo "Invalid option. Please enter 1 or 2." ;;
-            4) INSTALL_LEVEL="server"; break ;;
-            *) echo "Invalid option. Please enter 1, 2, 3, or 4." ;;
         esac
     done