diff --git a/Configs/.config/Kvantum/kvantum.kvconfig b/Configs/.config/Kvantum/kvantum.kvconfig deleted file mode 100644 index 14c5b92..0000000 --- a/Configs/.config/Kvantum/kvantum.kvconfig +++ /dev/null @@ -1,2 +0,0 @@ -[General] -theme=KvGnomeDark diff --git a/Configs/.config/qt5ct/qt5ct.conf b/Configs/.config/qt5ct/qt5ct.conf index b7ffaa2..11e4b1e 100644 --- a/Configs/.config/qt5ct/qt5ct.conf +++ b/Configs/.config/qt5ct/qt5ct.conf @@ -1,9 +1,9 @@ [Appearance] -color_scheme_path=/usr/share/qt5ct/colors/darker.conf +color_scheme_path=/home/$USER/.local/share/color-schemes/Matugen.colors custom_palette=true icon_theme=Papirus-Dark -standard_dialogs=gtk3 -style=Fusion +standard_dialogs=xdgdesktopportal +style=Darkly [Fonts] fixed="Noto Sans,12,-1,5,50,0,0,0,0,0,Regular" @@ -19,13 +19,16 @@ gui_effects=@Invalid() keyboard_scheme=2 menus_have_icons=true show_shortcuts_in_context_menus=true -stylesheets=/usr/share/qt5ct/qss/fusion-fixes.qss, /usr/share/qt5ct/qss/traynotification-simple.qss +stylesheets=@Invalid() toolbutton_style=4 underline_shortcut=1 wheel_scroll_lines=3 +[PaletteEditor] +geometry=@Invalid() + [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\xb0\0\0\x3\xfc\0\0\0\0\0\0\0\0\0\0\x3\xbf\0\0\x4\xe\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x3\xb0\0\0\x3\xfc) +geometry=@Invalid() [Troubleshooting] force_raster_widgets=1 diff --git a/Configs/.config/qt6ct/qt6ct.conf b/Configs/.config/qt6ct/qt6ct.conf index 9e7f45d..d24dbca 100644 --- a/Configs/.config/qt6ct/qt6ct.conf +++ b/Configs/.config/qt6ct/qt6ct.conf @@ -1,9 +1,9 @@ [Appearance] -color_scheme_path=/usr/share/color-schemes/KvGnomeDark.colors +color_scheme_path=/home/$USER/.local/share/color-schemes/Matugen.colors custom_palette=true icon_theme=Papirus-Dark -standard_dialogs=gtk3 -style=kvantum-dark +standard_dialogs=xdgdesktopportal +style=Darkly [Fonts] fixed="Noto Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Regular" @@ -24,8 +24,11 @@ toolbutton_style=4 underline_shortcut=1 wheel_scroll_lines=3 +[PaletteEditor] +geometry=@Invalid() + [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\am\0\0\x3\xfc\0\0\0\0\0\0\0\0\0\0\am\0\0\x3\xfc\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\am\0\0\x3\xfc) +geometry=@Invalid() [Troubleshooting] force_raster_widgets=1 diff --git a/README.md b/README.md index 1c8fcfb..6cfdee0 100644 --- a/README.md +++ b/README.md @@ -586,21 +586,16 @@ gsettings set org.gnome.desktop.interface gtk-theme Adwaita-dark ## Qt -https://github.com/tsujan/Kvantum - -Настройка Kvantum. [[конфиг](./Configs/.config/kvantum/)] - -https://www.opencode.net/trialuser/qt6ct +https://aur.archlinux.org/packages/qt6ct-kde Настройка Qt6. [[конфиг](./Configs/.config/qt6ct/)] -https://sourceforge.net/projects/qt5ct/ +https://aur.archlinux.org/packages/qt5ct-kde Настройка Qt5. [[конфиг](./Configs/.config/qt5ct/)] ``` -sudo pacman -S kvantum qt5ct -yay -S qt6cd-kde +yay -S qt6cd-kde qt5ct-kde darkly-qt5-git darkly-qt6-git ``` ## SwayNC diff --git a/Scripts/install.sh b/Scripts/install.sh index 6fccf21..2837d81 100755 --- a/Scripts/install.sh +++ b/Scripts/install.sh @@ -143,10 +143,13 @@ setup_theme() { mkdir -p "$HOME/.themes/Adwaita-Dark/gtk-3.0" echo '@import url("resource:///org/gtk/libgtk/theme/Adwaita/gtk-contained-dark.css");' >"$HOME/.themes/Adwaita-Dark/gtk-3.0/gtk.css" + gsettings set org.gnome.desktop.interface color-scheme prefer-dark || echo -e "${YELLOW}Не удалось установить color-scheme через gsettings.${RESET}" gsettings set org.gnome.desktop.interface gtk-theme Adwaita-dark || echo -e "${YELLOW}Не удалось установить gtk-theme через gsettings.${RESET}" + nwg-look -a || echo -e "${YELLOW}Не удалось применить тему через nwg-look.${RESET}" - echo -e "${GREEN}Тема GTK настроена.${RESET}" + + echo -e "${GREEN}Темы применены.${RESET}" } setup_wallpapers() { @@ -155,7 +158,7 @@ setup_wallpapers() { cp -r "$DOTFILES_DIR/Assets/wallpapers/"* "$wallpaper_dest/" echo -e "${GREEN}Обои скопированы в $wallpaper_dest${RESET}" - waypaper --backend swww --random --folder "$wallpaper_dest" || echo -e "${YELLOW}Не удалось установить обои через waypaper.${RESET}" + "$DOTFILES_DIR/Configs/.config/retrilz-scripts/change-wall.sh" ~/Pictures/Wallpapers echo -e "${GREEN}Обои установлены.${RESET}" } @@ -166,6 +169,7 @@ reload_services() { uwsm app -- waybar -c "$HOME/.config/waybar/config.jsonc" -s "$HOME/.config/waybar/styles.css" >/dev/null 2>&1 & disown + echo -e "${GREEN}Waybar перезапущен.${RESET}" } @@ -216,7 +220,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 mpvpaper + install_yay waypaper swww print_section "Скриншоты и запись экрана" install_pacman grim hyprshot @@ -227,8 +231,8 @@ main() { setup_zsh_plugins print_section "GTK и Qt оформление" - install_yay qt6ct-kde || install_pacman qt6ct - install_pacman nwg-look qt5ct kvantum + install_yay qt6ct-kde qt5ct-kde darkly-qt5-git darkly-qt6-git + install_pacman nwg-look backup_configs apply_new_configs