add installers

5 files changed, 49 insertions, 7 deletions

diff --git a/library/setupPkg.sh b/library/setupPkg.sh
index bae4683..75ce3f5 100644
--- a/library/setupPkg.sh
+++ b/library/setupPkg.sh
@@ -1,7 +1,7 @@
 #!/bin/bash 
 
 if [ "$1" = "pipx" ]; then
-  source $HOME/bin/setupPkgPipx.sh
+  source $HOME/"$dirArchIsoFiles"/setupPkgPipx.sh
 elif [ "$1" = "yay" ]; then
-  source $HOME/bin/setupPkgYay.sh 
+  source $HOME/"$dirArchIsoFiles"/setupPkgYay.sh 
 fi
diff --git a/library/setupPkgPipx.sh b/library/setupPkgPipx.sh
new file mode 100755
index 0000000..84dea4a
--- /dev/null
+++ b/library/setupPkgPipx.sh
@@ -0,0 +1,11 @@
+#!/bin/bash 
+
+setupPkgPipx () {
+  readarray -t pipxPkg < <(cat $HOME/"$dirArchIsoFiles"/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/stow/stow.sh b/library/stow/stow.sh
index 882d730..2a37175 100644
--- a/library/stow/stow.sh
+++ b/library/stow/stow.sh
@@ -18,15 +18,16 @@ abortedPkg () {
 }
 
 startStow () {
-  abortedPkg "delete"
-  stowReadArrays
-
+    
   if [ -d "$dotfiles" ]; then
       echo "✅ Папка .dotfiles есть"
   else
       source "$dirArchIsoFiles"/library/cloneDotfiles.sh
   fi
 
+  abortedPkg "delete"
+  stowReadArrays
+
   select event in "Stow extract" "Stow update" "Stow add" "Stow adopt" "Back"; do 
     case "$event" in
       "Stow extract")
diff --git a/user_configuration.json b/user_configuration.json
index 7c002a2..815275d 100644
--- a/user_configuration.json
+++ b/user_configuration.json
@@ -52,7 +52,8 @@
         "keepassxc",
         "wget",
         "python-pipx",
-        "wl-clipboard"
+        "wl-clipboard",
+        "networkmanager"
     ],
     "parallel downloads": 0,
     "profile_config": {
@@ -72,4 +73,4 @@
     "timezone": "Asia/Yekaterinburg",
     "uki": false,
     "version": "2.7.1"
-}
\ No newline at end of file
+}