improved

modules/desktop.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+echo
+echo "  => Desktop"
+echo
+
+# Disable all managed interfaces excerpt loopback from /etc/network/interfaces file to allow NetworkManager to manage them
+sed -i '/# The primary network interface/Q' /etc/network/interfaces
+
+# Qt5ct and qt6ct configuration
+grep -E "(export QT_QPA_PLATFORMTHEME=qt5ct)" /etc/environment > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+    echo "export QT_QPA_PLATFORMTHEME=qt5ct" >> /etc/environment
+fi
+
+# Copy user config files
+if [ ! -d ~/.config ]; then
+    mkdir ~/.config
+fi
+cp -r config/* ~/.config
+
+if [ ! -d /etc/skel/.config ]; then
+    mkdir /etc/skel/.config
+fi
+cp -r config/* /etc/skel/.config

modules/docker.sh

@@ -1,16 +1,10 @@
 #!/bin/bash
 
-#############
-### Docker
-
 echo
 echo "  => Docker"
 echo
 
-if [ -f /usr/bin/docker ]
-then
-    echo "    -> Already done !"
-else
+if [ ! -f /usr/bin/docker ]; then
     # Add Docker's official GPG key
     mkdir -p /etc/apt/keyrings
     curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg --yes

modules/pkgs.sh

@@ -1,15 +1,44 @@
 #!/bin/bash
 
-#######################
-### Install packages
-
 echo
 echo "  => Packages"
 echo
 
-pkglist="git
-         htop
-         tree
-         rsync"
+base="git
+      htop
+      tree
+      rsync"
 
-apt-get install $pkglist -y
+server=""
+
+desktop="adwaita-qt
+         adwaita-qt6
+         qt5ct
+         qt6ct
+         xfce4
+         firefox-esr
+         firefox-esr-l10n-fr
+         libreoffice
+         libreoffice-l10n-fr
+         thunderbird
+         thunderbird-l10n-fr
+         vlc"
+
+if [ $profile = server ]; then
+    pkglist="$base
+             $server"
+fi
+
+if [ $profile = desktop ]; then
+    pkglist="$base
+             $server
+             $desktop"
+fi
+
+for i in $pkglist
+do
+    dpkg -l $i > /dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        apt-get install $i -y
+    fi
+done

modules/repos.sh

@@ -1,10 +1,12 @@
 #!/bin/bash
 
-###########################
-### Repos configuration
-
 echo
-echo "  => Repos configuration"
+echo "  => Repositories"
 echo
 
-cp config/sources.list /etc/apt/sources.list
+grep -E "(contrib|non-free)" /etc/apt/sources.list > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+    sed -i "s/http:\/\/deb.debian.org\/debian\/ trixie main non-free-firmware/& contrib non-free/" /etc/apt/sources.list
+    sed -i "s/http:\/\/security.debian.org\/debian-security trixie-security main non-free-firmware/& contrib non-free/" /etc/apt/sources.list
+    sed -i "s/http:\/\/deb.debian.org\/debian\/ trixie-updates main non-free-firmware/& contrib non-free/" /etc/apt/sources.list
+fi

modules/scripts.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-###################
-### Copy scripts
-
 echo
 echo "  => Scripts"
 echo

modules/updates.sh

@@ -1,10 +1,7 @@
 #!/bin/bash
 
-#############
-### Update
-
 echo
-echo "  => Update"
+echo "  => Updates"
 echo
 
 apt-get update

modules/volumes.sh

@@ -1,26 +1,17 @@
 #!/bin/bash
 
-##########################
-### Volumes mountpoints
-
 echo
-echo "  => Volumes mountpoints"
+echo "  => Volumes"
 echo
 
-if [ -d /var/netig/srv ]
-then
-    echo "    -> Already done !"
-else
+if [ ! -d /var/netig/srv ]; then
     mkdir -p /var/netig/srv
     echo
     echo "   => Adjust /etc/fstab accordingly !"
     echo
 fi
 
-if [ -d /var/netig/bak ]
-then
-    echo "    -> Already done !"
-else
+if [ ! -d /var/netig/bak ]; then
     mkdir -p /var/netig/bak
     echo
     echo "   => Adjust /etc/fstab accordingly !"

modules/zram.sh

@@ -1,16 +1,11 @@
 #!/bin/bash
 
-###########
-### ZRAM
-
 echo
 echo "  => ZRAM"
 echo
 
-if [ -f /usr/bin/zramswap ]
-then
-    echo "    -> Already done !"
-else
+dpkg -l zram-tools > /dev/null 2>&1
+if [ $? -ne 0 ]; then
     apt-get install zram-tools -y
     sed -i '/#ALGO=lz4/s/^#//g' /etc/default/zramswap
     sed -i '/#PERCENT=50/s/^#//g' /etc/default/zramswap