From abebac310ba2aa89659ab097bbd44eb364c2631b Mon Sep 17 00:00:00 2001
From: retrilzzy <retrilzzy@gmail.com>
Date: Wed, 22 Oct 2025 23:06:39 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=B0=20=D1=83?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scripts/install.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Scripts/install.sh b/Scripts/install.sh
index 699ba4c..6fccf21 100755
--- a/Scripts/install.sh
+++ b/Scripts/install.sh
@@ -72,6 +72,16 @@ ensure_yay() {
     fi
 }
 
+setup_zsh_plugins() {
+    if [ ! -d "$HOME/.oh-my-zsh" ]; then
+        sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended || true
+    fi
+    sudo chsh -s /bin/zsh "$USER"
+    git clone https://github.com/romkatv/powerlevel10k.git "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k" || true
+    git clone https://github.com/zsh-users/zsh-syntax-highlighting.git "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting" || true
+    git clone https://github.com/zsh-users/zsh-autosuggestions "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions" || true
+}
+
 backup_configs() {
     print_section "Резервное копирование существующих конфигураций"
 
@@ -206,10 +216,7 @@ main() {
     install_pacman waybar uwsm rofi hypridle wl-clipboard cliphist wl-clip-persist kitty flameshot fastfetch lsd trash-cli nautilus
 
     print_section "Обои и оформление"
-    install_yay waypaper swww
-
-    print_section "Видео-обои"
-    install_yay mpvpaper
+    install_yay waypaper swww mpvpaper
 
     print_section "Скриншоты и запись экрана"
     install_pacman grim hyprshot
@@ -217,19 +224,12 @@ main() {
 
     print_section "Zsh и плагины"
     install_pacman zsh
-    if [ ! -d "$HOME/.oh-my-zsh" ]; then
-        sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended || true
-    fi
-    sudo chsh -s /bin/zsh "$USER"
-    git clone https://github.com/romkatv/powerlevel10k.git "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k" || true
-    git clone https://github.com/zsh-users/zsh-syntax-highlighting.git "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting" || true
-    git clone https://github.com/zsh-users/zsh-autosuggestions "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions" || true
+    setup_zsh_plugins
 
     print_section "GTK и Qt оформление"
-    install_yay qt6ct-kde
+    install_yay qt6ct-kde || install_pacman qt6ct
     install_pacman nwg-look qt5ct kvantum
 
-    clone_repo
     backup_configs
     apply_new_configs
     setup_theme