update

5 files changed, 128 insertions, 41 deletions

diff --git a/install.sh b/install.sh
index 8f20532..ff37fb6 100755
--- a/install.sh
+++ b/install.sh
@@ -20,7 +20,10 @@ startSetup () {
   select event in "Setup packages" "Stow" "Create default home dirs"; do
       case $event in
 		    "Setup packages")
-          source "$dirArchIsoFiles"/library/setupPkg.sh
+
+          select installer in "yay" "pipx"; do 
+              source "$dirArchIsoFiles"/library/setupPkg.sh "$installer"
+          done
 
           break
 			    ;;
diff --git a/library/setupPkg.sh b/library/setupPkg.sh
new file mode 100644
index 0000000..bae4683
--- /dev/null
+++ b/library/setupPkg.sh
@@ -0,0 +1,7 @@
+#!/bin/bash 
+
+if [ "$1" = "pipx" ]; then
+  source $HOME/bin/setupPkgPipx.sh
+elif [ "$1" = "yay" ]; then
+  source $HOME/bin/setupPkgYay.sh 
+fi
diff --git a/library/setupPkgPipx.sh b/library/setupPkgPipx.sh
deleted file mode 100644
index c208805..0000000
--- a/library/setupPkgPipx.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash 
-
-setupPkgPipx () {
-  readarray -t pipxPkg < <(cat $HOME/archisofiles/pkglists/pipxpkglist.txt)
-
-  for pkg in ${pipxPkg[@]}; do
-    pipx install "$pkg" 
-  done
-}
-
-setupPkgPipx
diff --git a/library/setupPkgYay.sh b/library/setupPkgYay.sh
deleted file mode 100755
index 2c3e547..0000000
--- a/library/setupPkgYay.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash 
-
-setupPkgYay () {
-  cd
-  git clone https://aur.archlinux.org/yay
-  
-  cd $HOME/yay
-  makepkg -isr
-
-  cd 
-  rm -rf $HOME/yay
-
-  if [ "$1" = "pc" ]; then
-    yay -S --needed - < "$dirArchIsoFiles"/pkglists/pkglist.txt
-  elif [ "$1" = "notebook" ]; then
-    yay -S --needed - < "$dirArchIsoFiles"/pkglists/pkglistnote.txt
-  fi
-}
-
-select platform in "pc" "notebook"; do 
-
-    if [ "$platform" = "" ]; then
-      echo "Invalid option"
-      break
-    else
-      setupPkgYay "$platform"
-    fi
-
-done
diff --git a/pkglist.txt b/pkglist.txt
new file mode 100644
index 0000000..050767d
--- /dev/null
+++ b/pkglist.txt
@@ -0,0 +1,117 @@
+alacarte
+audacity
+awesome-terminal-fonts
+base
+base-devel
+bc
+btrfs-progs
+code
+deepl-electron-bin
+deluge
+efibootmgr
+firefox
+font-manager
+foot
+git
+github-cli
+glow
+gnome-disk-utility-git
+google-chrome
+gparted
+gptfdisk
+grim
+gst-plugin-pipewire
+habito
+htop
+imagemagick
+intel-ucode
+keepassxc
+khal
+kompare
+libpulse
+libreoffice-still-ru
+libsixel
+linux
+linux-firmware
+mako
+man-db
+man-pages-ru
+mediainfo
+mpv
+nano
+nautilus
+navi
+neofetch
+neovim
+network-manager-applet
+networkmanager
+nodejs-lts-hydrogen
+noto-fonts
+noto-fonts-cjk
+noto-fonts-emoji
+npm
+ntfs-3g
+obs-studio
+obsidian
+otf-font-awesome
+pavucontrol
+pdfarranger
+peaclock
+pipewire
+pipewire-alsa
+pipewire-jack
+pipewire-pulse
+poppler
+powerkit
+python-pip
+python-pipx
+qbittorrent
+qt5-wayland
+qt6-wayland
+qutebrowser
+refind
+ripgrep
+semantik
+shellcheck
+shotcut
+slurp
+socat
+sof-firmware
+stow
+sudo
+sway
+swaybg
+swaylock
+tango-icon-theme
+telegram-desktop
+ttf-font-awesome
+ttf-jetbrains-mono
+ttf-joypixels
+ttf-nerd-fonts-symbols
+udiskie
+unzip
+ventoy-bin
+vifm
+vimiv
+virtualbox
+virtualbox-ext-oracle
+virtualbox-guest-iso
+virtualbox-host-modules-arch
+vot-cli-git
+waybar
+wget
+wireplumber
+wl-clipboard
+wofi
+wofi-emoji
+xdg-desktop-portal-wlr
+xorg-xwayland
+yandex-disk
+yandex-disk-indicator
+yay
+yewtube-git
+zathura
+zathura-djvu
+zathura-pdf-mupdf
+zip
+zram-generator