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

---
 install.sh | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/install.sh b/install.sh
index 47d9d21..114cb3d 100644
--- a/install.sh
+++ b/install.sh
@@ -56,7 +56,7 @@ 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 Martin Qtile Desktop installation ?" 10 50); then
+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
     echo -e "${GREEN} Okay, let's start the installation"
 else
     exit 1
@@ -112,12 +112,17 @@ fi
 
 
 # Core System apt install
-sudo apt install -y xserver-xorg x11-utils xinit arandr autorandr picom mesa-utils htop feh wget curl git pulseaudio pulsemixer numlockx cups xsensors xbacklight unzip
+sudo apt install -y xserver-xorg x11-utils xinit arandr autorandr picom mesa-utils htop feh wget curl git alsa-utils alsa-tools pulseaudio numlockx cups xsensors xbacklight brightnessctl unzip
 sudo apt install -y sddm --no-install-recommends
 
 sudo apt install -y nitrogen dunst notify-osd xarchiver mpv flameshot speedcrunch mc gvfs-backends
 
-# Add Pulseaudio to system startup as user.
+# Audio on system - https://alsa.opensrc.org - https://wiki.debian.org/ALSA
+# See hardware run: "pacmd list-sinks" or "lspci | grep -i audio" or... sudo dmesg  | grep 'snd\|firmware\|audio'
+# Test file run: "aplay /usr/share/sounds/alsa/Noise.wav"
+sudo adduser $USER audio
+sudo alsactl init
+
 systemctl --user enable pulseaudio
 
 # CPU Microcode install start
@@ -2107,6 +2112,11 @@ keys = [
     Key([mod], "r", lazy.spawn(runmenu), desc='Launch Run Menu'),
     Key([mod, "shift"], "r", lazy.spawncmd(), desc="Spawn a command using a prompt widget"),
 
+    #  Audio
+    Key([mod, "mod1"], "Up", lazy.spawn("amixer set Master 2%+"), desc='Volume Up'),
+    Key([mod, "mod1"], "Down", lazy.spawn("amixer set Master 5%-"), desc='Volume down'),
+    Key([mod, "mod1"], "m", lazy.spawn("amixer set Master toggle"), desc='Volume Mute'),
+    
     #  Default
     Key([mod], "h", lazy.layout.left(), desc="Move focus to left"),
     Key([mod], "l", lazy.layout.right(), desc="Move focus to right"),
@@ -2154,14 +2164,14 @@ keys = [
     Key([mod, "mod1", "control"], "q", lazy.shutdown(), desc="Shutdown Qtile"),
 
     # XF86 Audio & Brightness keys
-    Key([], "XF86AudioRaiseVolume", lazy.spawn("pactl set-sink-volume 0 +1%"), desc='Volume Up'),
-    Key([], "XF86AudioLowerVolume", lazy.spawn("pactl set-sink-volume 0 -3%"), desc='volume down'),
-    Key([], "XF86AudioMute", lazy.spawn("pulsemixer --toggle-mute"), desc='Volume Mute'),
-    Key([], "XF86AudioPlay", lazy.spawn("playerctl play-pause"), desc='play-pause'),
-    Key([], "XF86AudioPrev", lazy.spawn("playerctl previous"), desc='previous'),
-    Key([], "XF86AudioNext", lazy.spawn("playerctl next"), desc='next'),
-    Key([], "XF86MonBrightnessUp", lazy.spawn("brightnessctl s 10%+"), desc='brightness UP'),
-    Key([], "XF86MonBrightnessDown", lazy.spawn("brightnessctl s 10%-"), desc='brightness Down'),
+    Key([], "XF86AudioRaiseVolume", lazy.spawn("amixer set Master 2%+"), desc='Volume Up'),
+    Key([], "XF86AudioLowerVolume", lazy.spawn("amixer set Master 5%+"), desc='Volume down'),
+    Key([], "XF86AudioMute", lazy.spawn("amixer set Master toggle"), desc='Volume Mute'),
+    Key([], "XF86AudioPlay", lazy.spawn("playerctl play-pause"), desc='Play-Pause'),
+    Key([], "XF86AudioPrev", lazy.spawn("playerctl previous"), desc='Previous'),
+    Key([], "XF86AudioNext", lazy.spawn("playerctl next"), desc='Next'),
+    Key([], "XF86MonBrightnessUp", lazy.spawn("brightnessctl set +10"), desc='brightness UP'),
+    Key([], "XF86MonBrightnessDown", lazy.spawn("brightnessctl set 10-"), desc='brightness Down'),
 ]
 
 # Add key bindings to switch VTs in Wayland.
@@ -2223,7 +2233,7 @@ groups.append(ScratchPad("scratchpad", [
     DropDown("term", "kitty --class=scratch", width=0.8, height=0.8, x=0.1, y=0.1, opacity=1),
     DropDown("term2", "kitty --class=scratch", width=0.8, height=0.8, x=0.1, y=0.1, opacity=1),
     DropDown("mc", "kitty --class=mc -e mc", width=0.8, height=0.8, x=0.1, y=0.1, opacity=1),
-    DropDown("volume", "kitty --class=volume -e pulsemixer", width=0.8, height=0.8, x=0.1, y=0.1, opacity=1),
+    DropDown("volume", "kitty --class=volume -e alsamixer", width=0.8, height=0.8, x=0.1, y=0.1, opacity=1),
 
 ]))