diff --git a/Configs/.config/gtk-3.0/gtk.css b/Configs/.config/gtk-3.0/gtk.css new file mode 100644 index 0000000..e88cfe0 --- /dev/null +++ b/Configs/.config/gtk-3.0/gtk.css @@ -0,0 +1 @@ +@import "./colors.css"; diff --git a/Configs/.config/gtk-3.0/settings.ini b/Configs/.config/gtk-3.0/settings.ini index 26e4b83..910f770 100644 --- a/Configs/.config/gtk-3.0/settings.ini +++ b/Configs/.config/gtk-3.0/settings.ini @@ -1,5 +1,5 @@ [Settings] -gtk-theme-name=Adwaita-Dark +gtk-theme-name=adw-gtk3-dark gtk-icon-theme-name=Papirus-Dark gtk-font-name=Noto Sans 12 gtk-cursor-theme-name=BreezeX-RosePine-Linux diff --git a/Configs/.config/gtk-4.0 /gtk.css b/Configs/.config/gtk-4.0 /gtk.css new file mode 100644 index 0000000..e88cfe0 --- /dev/null +++ b/Configs/.config/gtk-4.0 /gtk.css @@ -0,0 +1 @@ +@import "./colors.css"; diff --git a/Configs/.config/gtk-4.0 /settings.ini b/Configs/.config/gtk-4.0 /settings.ini new file mode 100644 index 0000000..66c6663 --- /dev/null +++ b/Configs/.config/gtk-4.0 /settings.ini @@ -0,0 +1,7 @@ +[Settings] +gtk-theme-name=adw-gtk3-dark +gtk-icon-theme-name=Papirus-Dark +gtk-font-name=Noto Sans 12 +gtk-cursor-theme-name=BreezeX-RosePine-Linux +gtk-cursor-theme-size=28 +gtk-application-prefer-dark-theme=1 diff --git a/Configs/.config/nwg-look/config b/Configs/.config/nwg-look/config index 9314182..71464ea 100644 --- a/Configs/.config/nwg-look/config +++ b/Configs/.config/nwg-look/config @@ -2,5 +2,6 @@ "export-settings-ini": true, "export-gtkrc-20": true, "export-index-theme": true, - "export-xsettingsd": true -} \ No newline at end of file + "export-xsettingsd": true, + "export-gtk4-symlinks": false +} diff --git a/README.md b/README.md index 6cfdee0..3112ba0 100644 --- a/README.md +++ b/README.md @@ -567,33 +567,26 @@ sudo pacman -S lsd https://github.com/nwg-piotr/nwg-look -``` -sudo pacman -S nwg-look -``` - -**Дефолтная темная тема** +https://github.com/lassekongo83/adw-gtk3 ``` -> ~/.themes/Adwaita-Dark/gtk-3.0/gtk.css - -@import url("resource:///org/gtk/libgtk/theme/Adwaita/gtk-contained-dark.css"); +sudo pacman -S nwg-look adw-gtk-theme ``` ``` -gsettings set org.gnome.desktop.interface color-scheme prefer-dark -gsettings set org.gnome.desktop.interface gtk-theme Adwaita-dark +gsettings set org.gnome.desktop.interface gtk-theme 'adw-gtk3-dark' && gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' ``` ## Qt -https://aur.archlinux.org/packages/qt6ct-kde - Настройка Qt6. [[конфиг](./Configs/.config/qt6ct/)] -https://aur.archlinux.org/packages/qt5ct-kde - Настройка Qt5. [[конфиг](./Configs/.config/qt5ct/)] +https://aur.archlinux.org/packages/qt6ct-kde + +https://aur.archlinux.org/packages/qt5ct-kde + ``` yay -S qt6cd-kde qt5ct-kde darkly-qt5-git darkly-qt6-git ``` diff --git a/Scripts/install.sh b/Scripts/install.sh index 517673d..b78e052 100755 --- a/Scripts/install.sh +++ b/Scripts/install.sh @@ -141,11 +141,7 @@ apply_new_configs() { setup_theme() { print_section "Применение темы" - 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}" + gsettings set org.gnome.desktop.interface gtk-theme 'adw-gtk3-dark' && gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' nwg-look -a || echo -e "${YELLOW}Не удалось применить тему через nwg-look.${RESET}" @@ -232,7 +228,7 @@ main() { print_section "GTK и Qt оформление" install_yay qt6ct-kde qt5ct-kde darkly-qt5-git darkly-qt6-git - install_pacman nwg-look + install_pacman nwg-look adw-gtk-theme backup_configs apply_new_configs