From 9c6be19d19e3df67ceec414fdc516941ad3287a6 Mon Sep 17 00:00:00 2001
From: AngeD <ange.duhayon@epitech.eu>
Date: Thu, 9 Nov 2023 10:06:06 +0100
Subject: [PATCH] fix: pkg issues

---
 config             |  6 +++---
 gui/config         |  1 +
 gui/dwm/install.sh | 11 ++---------
 gui/install.sh     | 17 +++++------------
 install.sh         | 13 +++----------
 lib.sh             | 11 +++++++++++
 6 files changed, 25 insertions(+), 34 deletions(-)
 create mode 100644 lib.sh

diff --git a/config b/config
index 1cf8a20..6fb7a60 100644
--- a/config
+++ b/config
@@ -24,17 +24,17 @@ pkg=(
     gnu-netcat
     htop
     jq
-    linux{,lts,firmware}
+    linux{,-lts,-firmware}
     lsof
     man-{db,pages} tldr
     neofetch
     neovim{,-lspconfig,-nvim-treesitter} python-pynvim ripgrep tree-sitter-cli
-    networkmanager iptables-nft systemd-resolved wireguard-tools
+    networkmanager iptables-nft wireguard-tools
     p7zip unrar
     podman{,-compose}
     ranger
     reflector
-    rename{,utils}
+    renameutils perl-rename
     rsync
     terminus-font awesome-terminal-fonts
     tree
diff --git a/gui/config b/gui/config
index 5f80ac0..dd89abf 100644
--- a/gui/config
+++ b/gui/config
@@ -5,6 +5,7 @@ pkg=(
     flameshot
     gammastep
     imagemagick
+    keepassxc
     materia-{gtk-theme,kde} papirus-icon-theme gtk-engine-murrine
     mpv
     noto-fonts{,-cjk,-emoji} ttf-{dejavu,liberation}
diff --git a/gui/dwm/install.sh b/gui/dwm/install.sh
index 99e583c..34b038a 100755
--- a/gui/dwm/install.sh
+++ b/gui/dwm/install.sh
@@ -1,14 +1,7 @@
 #!/bin/bash -e
 cd "$(dirname "$0")"
 . ./config
-
-if [ -t 1 ]; then
-    NORMAL='\e[0m'
-    BOLD='\e[1m'
-    GREEN='\e[32m'
-fi
-
-PACMAN='pacman --noconfirm --needed -Syu'
+. ../../lib.sh
 
 if [ "$EUID" != 0 ]; then
     echo 'This script needs root privileges.'
@@ -27,7 +20,7 @@ case "$(lspci -k | grep -A3 -E '(VGA|3D)')" in
         pkg=("${pkg[@]}" xf86-video-nouveau)
         ;;
 esac
-$PACMAN "${pkg[@]}"
+pac "${pkg[@]}"
 
 cp -rfT rootfs /
 
diff --git a/gui/install.sh b/gui/install.sh
index 964f2a8..a7c379b 100755
--- a/gui/install.sh
+++ b/gui/install.sh
@@ -1,34 +1,27 @@
 #!/bin/bash -e
 cd "$(dirname "$0")"
 . ./config
-
-if [ -t 1 ]; then
-    NORMAL='\e[0m'
-    BOLD='\e[1m'
-    GREEN='\e[32m'
-fi
-
-PACMAN='pacman --noconfirm --needed -Syu'
+. ../lib.sh
 
 if [ "$EUID" != 0 ]; then
     echo 'This script needs root privileges.'
     exit 1
 fi
 
-$PACMAN "${pkg[@]}" flatpak
+pac "${pkg[@]}" flatpak
 flatpak install "${flatpakpkg[@]}"
 
 case "$(lspci -k | grep -E '(VGA|3D)')" in
     *AMD*)
-        $PACMAN mesa vulkan-radeon
+        pac mesa vulkan-radeon
         modules=amdgpu
         ;;
     *Intel*)
-        $PACMAN mesa vulkan-intel
+        pac mesa vulkan-intel
         modules=i915
         ;;
     *NVIDIA*)
-        $PACMAN nvidia{,-utils,-settings}
+        pac nvidia{,-utils,-settings}
         modules='nvidia nvidia_modeset nvidia_uvm nvidia_drm'
         ;;
 esac
diff --git a/install.sh b/install.sh
index 369f1c1..1706ab7 100755
--- a/install.sh
+++ b/install.sh
@@ -1,14 +1,7 @@
 #!/bin/bash -e
 cd "$(dirname "$0")"
 . ./config
-
-if [ -t 1 ]; then
-    NORMAL='\e[0m'
-    BOLD='\e[1m'
-    GREEN='\e[32m'
-fi
-
-PACMAN='pacman --noconfirm --needed -Syu'
+. ./lib.sh
 
 # System config
 cp -rfT rootfs/ /
@@ -29,7 +22,7 @@ esac
 sed -i '/^HOOKS=(/s/filesystems/encrypt filesystems/' /etc/mkinitcpio.conf
 
 # Packages
-$PACMAN "${pkg[@]}" "$cpu-ucode"
+pac "${pkg[@]}" "$cpu-ucode"
 systemctl enable     \
     NetworkManager   \
     ip6tables        \
@@ -40,7 +33,7 @@ systemctl enable     \
     systemd-timesyncd
 
 if ls -d /sys/class/power_supply/BAT*/ > /dev/null 2>&1; then
-    $PACMAN "${laptop_pkg[@]}"
+    pac "${laptop_pkg[@]}"
     systemctl enable tlp
 fi
 
diff --git a/lib.sh b/lib.sh
new file mode 100644
index 0000000..307577c
--- /dev/null
+++ b/lib.sh
@@ -0,0 +1,11 @@
+set -a
+
+if [ -t 1 ]; then
+    NORMAL='\e[0m'
+    BOLD='\e[1m'
+    GREEN='\e[32m'
+fi
+
+function pac() {
+    yes | pacman --needed -Syu
+}