update files

9 files changed, 63 insertions, 31 deletions

diff --git a/install.sh b/install.sh
index 255efe8..8f20532 100755
--- a/install.sh
+++ b/install.sh
@@ -17,10 +17,10 @@ setStatusE () {
 }
 
 startSetup () {
-  select event in "Yay setup packages" "Stow" "Create default home dirs"; do
+  select event in "Setup packages" "Stow" "Create default home dirs"; do
       case $event in
-		    "Yay setup packages")
-          source "$dirArchIsoFiles"/library/yaySetupPkg.sh
+		    "Setup packages")
+          source "$dirArchIsoFiles"/library/setupPkg.sh
 
           break
 			    ;;
diff --git a/library/cloneDotfiles.sh b/library/cloneDotfiles.sh
index 2268498..36c30fc 100755
--- a/library/cloneDotfiles.sh
+++ b/library/cloneDotfiles.sh
@@ -1,9 +1,12 @@
 #!/bin/bash 
 
-wget https://yadi.sk/d/o4TMFnHFobxTsw -O "$dirArchIsoFiles"/Passwords.html
+getKdbxFile () {
+  read -r passwordFile < <(yadisk-direct https://yadi.sk/d/o4TMFnHFobxTsw)
 
-openKeepass () {
+  wget "$passwordFile" -O $HOME/"$dirArchIsoFiles"/Passwords.kbdx
+}
 
+openKeepass () {
   setStatusE true
 
   keepassxc-cli clip "$dirArchIsoFiles"/Passwords.kdbx github 0 -a token-cli
@@ -11,14 +14,14 @@ openKeepass () {
 
 cloneDotfiles () {
   while :
-  do openKeepass
+  do 
+    openKeepass
     
 	  if [ $? -eq 0 ]; then
       setStatusE false
       echo -e "Пароль скопирован!\n"
       break
     fi
-
   done
 
   cd
@@ -26,4 +29,5 @@ cloneDotfiles () {
   wl-copy -c
 }
 
+source $HOME/"$dirArchIsoFiles"/setupPkgPipx.sh
 cloneDotfiles
diff --git a/library/setupPkgPipx.sh b/library/setupPkgPipx.sh
new file mode 100644
index 0000000..c208805
--- /dev/null
+++ b/library/setupPkgPipx.sh
@@ -0,0 +1,11 @@
+#!/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
new file mode 100755
index 0000000..2c3e547
--- /dev/null
+++ b/library/setupPkgYay.sh
@@ -0,0 +1,29 @@
+#!/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/library/yaySetupPkg.sh b/library/yaySetupPkg.sh
deleted file mode 100755
index 326a3b4..0000000
--- a/library/yaySetupPkg.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-yaySetupPkg () {
-  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"/pkglist.txt
-  elif [ "$1" = "notebook" ]; then
-    yay -S --needed - < "$dirArchIsoFiles"/pkglistnote.txt
-  fi
-}
-
-select platform in "pc" "notebook"; do 
-    yaySetupPkg "$platform"
-done
diff --git a/pipxpkglist.txt b/pipxpkglist.txt
new file mode 100644
index 0000000..1504ccf
--- /dev/null
+++ b/pipxpkglist.txt
@@ -0,0 +1,3 @@
+wldhx-yadisk-direct
+youtube-transcript-api
+yq
diff --git a/pkglists/pipxpkglist.txt b/pkglists/pipxpkglist.txt
new file mode 100644
index 0000000..1504ccf
--- /dev/null
+++ b/pkglists/pipxpkglist.txt
@@ -0,0 +1,3 @@
+wldhx-yadisk-direct
+youtube-transcript-api
+yq
diff --git a/pkglist.txt b/pkglists/pkglist.txt
index f109355..b682ae6 100644
--- a/pkglist.txt
+++ b/pkglists/pkglist.txt
@@ -9,7 +9,6 @@ code
 deepl-electron-bin
 deluge
 efibootmgr
-expect
 firefox
 font-manager
 foot
@@ -24,12 +23,13 @@ grim
 gst-plugin-pipewire
 habito
 htop
+imagemagick
 intel-ucode
 keepassxc
 khal
 komikku
+kompare
 libpulse
-libreoffice-still
 libreoffice-still-ru
 libsixel
 linux
@@ -42,7 +42,6 @@ mpv
 nano
 nautilus
 navi
-nb
 neofetch
 neovim
 network-manager-applet
@@ -53,6 +52,7 @@ noto-fonts-cjk
 noto-fonts-emoji
 npm
 ntfs-3g
+obs-studio
 obsidian
 otf-font-awesome
 pavucontrol
@@ -68,6 +68,7 @@ python-pip
 python-pipx
 qbittorrent
 qt5-wayland
+qt6-wayland
 qutebrowser
 refind
 ripgrep
@@ -78,6 +79,7 @@ slurp
 socat
 sof-firmware
 stow
+sudo
 sway
 swaybg
 swaylock
@@ -96,13 +98,13 @@ virtualbox-ext-oracle
 virtualbox-guest-iso
 virtualbox-host-modules-arch
 vot-cli-git
-w3m
 waybar
 wget
 wireplumber
 wl-clipboard
 wofi
 wofi-emoji
+xdg-desktop-portal-wlr
 xorg-xwayland
 yandex-disk
 yandex-disk-indicator
diff --git a/pkglistnote.txt b/pkglists/pkglistnote.txt
index 3ebfa58..3ebfa58 100644
--- a/pkglistnote.txt
+++ b/pkglists/pkglistnote.txt