From cd9c5cb2a12fe4ee3730449dd79245d296a40fcd Mon Sep 17 00:00:00 2001
From: Martin Andersen <post@itmail.dk>
Date: Sun, 19 May 2024 17:17:19 +0200
Subject: [PATCH] Update install.sh

---
 install.sh | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/install.sh b/install.sh
index 83f0c75..fe8b760 100644
--- a/install.sh
+++ b/install.sh
@@ -87,11 +87,12 @@ if ! dpkg -s whiptail >/dev/null 2>&1; then
     sudo apt update
     sudo apt install -y whiptail
 else
-    echo "whiptail is already installed."
+    echo -e "${YELLOW} Preparation before starting the installation... done ;-) ${NC}"
 fi
 
 clear
 
+
 # Installation start screen
 FULLUSERNAME=$(awk -v user="$USER" -F":" 'user==$1{print $5}' /etc/passwd)
 if (whiptail --title "Installation of the Martin Qtile Desktop" --yesno "Hi $FULLUSERNAME do you want to start \nThe M.A.D.E installation ?" 10 50); then
@@ -161,33 +162,38 @@ fi
 
 sudo apt update
 
+
 # -------------------------------------------------------------------------------------------------
 echo -e "${YELLOW} Core System APT install ${NC}"
-sudo apt install -y xserver-xorg x11-utils xinit arandr autorandr picom fwupd mesa-utils htop wget curl git alsa-utils alsa-tools numlockx cups xsensors xbacklight brightnessctl unzip network-manager dunst libnotify-bin notify-osd xautolock xsecurelock pm-utils rofi fontconfig fontconfig-config fonts-dejavu-core libfontconfig1 fonts-arkpandora tmux feh
+sudo apt install -y xserver-xorg x11-utils xinit arandr autorandr picom fwupd mesa-utils htop wget curl git tmux numlockx cups xsensors xbacklight brightnessctl unzip network-manager dunst libnotify-bin notify-osd xautolock xsecurelock pm-utils rofi fontconfig fontconfig-config fonts-dejavu-core libfontconfig1 fonts-arkpandora
 sudo apt install -y sddm --no-install-recommends
-
-sudo apt install -y nitrogen xarchiver mpv flameshot speedcrunch mc gvfs-backends mpd mpc ncmpcpp fzf nsxiv
+# sudo apt install -y feh
+sudo apt install -y nitrogen nsxiv mpv flameshot speedcrunch mc gvfs-backends mpd mpc ncmpcpp fzf xarchiver
 
 # -------------------------------------------------------------------------------------------------
-echo -e "${YELLOW} Audio on system - https://alsa.opensrc.org - https://wiki.debian.org/ALSA ${NC}"
+echo -e "${YELLOW} Audio Start - https://alsa.opensrc.org - https://wiki.debian.org/ALSA ${NC}"
 # See hardware run: "pacmd list-sinks" or "lspci | grep -i audio" or... sudo dmesg  | grep 'snd\|firmware\|audio'
+# Run.: "pw-cli info" provides detailed information about the PipeWire nodes and devices, including ALSA devices.
 # Test file run: "aplay /usr/share/sounds/alsa/Front_Center.wav"
 # sudo adduser $USER audio
-sudo alsactl init
+
 
 # PipeWire Sound Server "Audio" - https://pipewire.org/
-sudo apt install -y pipewire pipewire-pulse wireplumber pavucontrol
-systemctl --user enable pipewire.socket pipewire-pulse.socket
-systemctl --user enable wireplumber.service
+sudo apt install -y pipewire pipewire-pulse wireplumber pavucontrol alsa-utils
+systemctl enable --user --now pipewire.socket pipewire-pulse.socket wireplumber.service
+
+# More Audio tools
+# sudo apt install -y alsa-tools
 
 # PulseAudio
-#sudo apt install -y pulseaudio
-#systemctl --user enable pulseaudio
-
+# sudo apt install -y pulseaudio
+# systemctl --user enable pulseaudio
 
+# sudo alsactl init
 
+echo -e "${YELLOW} Audio End ${NC}"
 # -------------------------------------------------------------------------------------------------
-echo -e "${YELLOW} CPU Microcode install start ${NC}"
+echo -e "${YELLOW} CPU Microcode install ${NC}"
 export LC_ALL=C # All subsequent command output will be in English
 CPUVENDOR=$(lscpu | grep "Vendor ID:" | awk '{print $3}')