From 13eb5f3cfb004e5910c8e007bf1e23333c846e4e Mon Sep 17 00:00:00 2001 From: blueingreen68 Date: Thu, 28 Dec 2023 18:40:51 +0500 Subject: update files --- install.sh | 6 +-- library/cloneDotfiles.sh | 12 +++-- library/setupPkgPipx.sh | 11 +++++ library/setupPkgYay.sh | 29 ++++++++++++ library/yaySetupPkg.sh | 20 -------- pipxpkglist.txt | 3 ++ pkglist.txt | 115 ---------------------------------------------- pkglistnote.txt | 111 -------------------------------------------- pkglists/pipxpkglist.txt | 3 ++ pkglists/pkglist.txt | 117 +++++++++++++++++++++++++++++++++++++++++++++++ pkglists/pkglistnote.txt | 111 ++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 285 insertions(+), 253 deletions(-) create mode 100644 library/setupPkgPipx.sh create mode 100755 library/setupPkgYay.sh delete mode 100755 library/yaySetupPkg.sh create mode 100644 pipxpkglist.txt delete mode 100644 pkglist.txt delete mode 100644 pkglistnote.txt create mode 100644 pkglists/pipxpkglist.txt create mode 100644 pkglists/pkglist.txt create mode 100644 pkglists/pkglistnote.txt 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/pkglist.txt b/pkglist.txt deleted file mode 100644 index f109355..0000000 --- a/pkglist.txt +++ /dev/null @@ -1,115 +0,0 @@ -alacarte -audacity -awesome-terminal-fonts -base -base-devel -bc -btrfs-progs -code -deepl-electron-bin -deluge -efibootmgr -expect -firefox -font-manager -foot -git -github-cli -glow -gnome-disk-utility-git -google-chrome -gparted -gptfdisk -grim -gst-plugin-pipewire -habito -htop -intel-ucode -keepassxc -khal -komikku -libpulse -libreoffice-still -libreoffice-still-ru -libsixel -linux -linux-firmware -mako -man-db -man-pages-ru -mediainfo -mpv -nano -nautilus -navi -nb -neofetch -neovim -network-manager-applet -networkmanager -nodejs-lts-hydrogen -noto-fonts -noto-fonts-cjk -noto-fonts-emoji -npm -ntfs-3g -obsidian -otf-font-awesome -pavucontrol -pdfarranger -peaclock -pipewire -pipewire-alsa -pipewire-jack -pipewire-pulse -poppler -powerkit -python-pip -python-pipx -qbittorrent -qt5-wayland -qutebrowser -refind -ripgrep -semantik -shellcheck -shotcut -slurp -socat -sof-firmware -stow -sway -swaybg -swaylock -tango-icon-theme -telegram-desktop -ttf-font-awesome -ttf-jetbrains-mono -ttf-joypixels -ttf-nerd-fonts-symbols -udiskie -unzip -vifm -vimiv -virtualbox -virtualbox-ext-oracle -virtualbox-guest-iso -virtualbox-host-modules-arch -vot-cli-git -w3m -waybar -wget -wireplumber -wl-clipboard -wofi -wofi-emoji -xorg-xwayland -yandex-disk -yandex-disk-indicator -yay -yewtube-git -zathura -zathura-djvu -zathura-pdf-mupdf -zip -zram-generator diff --git a/pkglistnote.txt b/pkglistnote.txt deleted file mode 100644 index 3ebfa58..0000000 --- a/pkglistnote.txt +++ /dev/null @@ -1,111 +0,0 @@ -alacarte -audacity -awesome-terminal-fonts -base -base-devel -bc -blueman -bluez -bluez-utils -code -deluge -firefox -font-manager -foot -git -github-cli -glow -google-chrome -gparted -gptfdisk -grim -gst-plugin-pipewire -habito -htop -imagemagick -intel-ucode -keepassxc -khal -komikku -kompare -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 -peaclock -pipewire-alsa -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 -vifm -vimiv -virtualbox -virtualbox-ext-oracle -virtualbox-guest-iso -virtualbox-host-modules-arch -vot-cli-git -waybar -wget -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 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/pkglists/pkglist.txt b/pkglists/pkglist.txt new file mode 100644 index 0000000..b682ae6 --- /dev/null +++ b/pkglists/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 +komikku +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 +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 diff --git a/pkglists/pkglistnote.txt b/pkglists/pkglistnote.txt new file mode 100644 index 0000000..3ebfa58 --- /dev/null +++ b/pkglists/pkglistnote.txt @@ -0,0 +1,111 @@ +alacarte +audacity +awesome-terminal-fonts +base +base-devel +bc +blueman +bluez +bluez-utils +code +deluge +firefox +font-manager +foot +git +github-cli +glow +google-chrome +gparted +gptfdisk +grim +gst-plugin-pipewire +habito +htop +imagemagick +intel-ucode +keepassxc +khal +komikku +kompare +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 +peaclock +pipewire-alsa +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 +vifm +vimiv +virtualbox +virtualbox-ext-oracle +virtualbox-guest-iso +virtualbox-host-modules-arch +vot-cli-git +waybar +wget +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 -- cgit