From 6fdb42ecd951e8b035ec1c84972f6cdea82593d6 Mon Sep 17 00:00:00 2001 From: retrilzzy Date: Sat, 13 Dec 2025 23:57:49 +0500 Subject: [PATCH] Replace Rose-Pine cursor with Bibata-Modern-Classic --- .vscode/settings.json | 1 + Configs/.config/gtk-3.0/gtk-dark.css | 1 + Configs/.config/gtk-3.0/settings.ini | 4 +- Configs/.config/gtk-4.0/gtk-dark.css | 1 + Configs/.config/gtk-4.0/settings.ini | 7 --- Configs/.config/nwg-look/config | 10 ++--- Configs/.config/xsettingsd/xsettingsd.conf | 9 ---- Configs/.local/share/nwg-look/gsettings | 4 +- README-ru.md | 50 +++++++++++----------- README.md | 10 +++-- Scripts/install.sh | 22 +++++++++- 11 files changed, 64 insertions(+), 55 deletions(-) create mode 100644 Configs/.config/gtk-3.0/gtk-dark.css create mode 100644 Configs/.config/gtk-4.0/gtk-dark.css delete mode 100644 Configs/.config/gtk-4.0/settings.ini delete mode 100644 Configs/.config/xsettingsd/xsettingsd.conf diff --git a/.vscode/settings.json b/.vscode/settings.json index ab69f06..ab15269 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "cSpell.words": [ "bezier", + "Bibata", "binde", "bindel", "bindl", diff --git a/Configs/.config/gtk-3.0/gtk-dark.css b/Configs/.config/gtk-3.0/gtk-dark.css new file mode 100644 index 0000000..7b0f310 --- /dev/null +++ b/Configs/.config/gtk-3.0/gtk-dark.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 910f770..4be165a 100644 --- a/Configs/.config/gtk-3.0/settings.ini +++ b/Configs/.config/gtk-3.0/settings.ini @@ -2,8 +2,8 @@ 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-cursor-theme-name=Bibata-Modern-Classic +gtk-cursor-theme-size=22 gtk-toolbar-style=GTK_TOOLBAR_ICONS gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR gtk-button-images=0 diff --git a/Configs/.config/gtk-4.0/gtk-dark.css b/Configs/.config/gtk-4.0/gtk-dark.css new file mode 100644 index 0000000..7b0f310 --- /dev/null +++ b/Configs/.config/gtk-4.0/gtk-dark.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 deleted file mode 100644 index 66c6663..0000000 --- a/Configs/.config/gtk-4.0/settings.ini +++ /dev/null @@ -1,7 +0,0 @@ -[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 71464ea..c3053d4 100644 --- a/Configs/.config/nwg-look/config +++ b/Configs/.config/nwg-look/config @@ -1,7 +1,7 @@ { - "export-settings-ini": true, - "export-gtkrc-20": true, - "export-index-theme": true, - "export-xsettingsd": true, - "export-gtk4-symlinks": false + "export-settings-ini": true, + "export-gtkrc-20": true, + "export-index-theme": true, + "export-xsettingsd": false, + "export-gtk4-symlinks": false } diff --git a/Configs/.config/xsettingsd/xsettingsd.conf b/Configs/.config/xsettingsd/xsettingsd.conf deleted file mode 100644 index 622c455..0000000 --- a/Configs/.config/xsettingsd/xsettingsd.conf +++ /dev/null @@ -1,9 +0,0 @@ -Net/ThemeName "Adwaita-Dark" -Net/IconThemeName "Papirus-Dark" -Gtk/CursorThemeName "BreezeX-RosePine-Linux" -Net/EnableEventSounds 1 -EnableInputFeedbackSounds 0 -Xft/Antialias 1 -Xft/Hinting 1 -Xft/HintStyle "hintslight" -Xft/RGBA "rgb" diff --git a/Configs/.local/share/nwg-look/gsettings b/Configs/.local/share/nwg-look/gsettings index b37d2b4..d201aa7 100644 --- a/Configs/.local/share/nwg-look/gsettings +++ b/Configs/.local/share/nwg-look/gsettings @@ -2,8 +2,8 @@ gtk-theme=adw-gtk3-dark icon-theme=Papirus-Dark font-name=Noto Sans 12 -cursor-theme=BreezeX-RosePine-Linux -cursor-size=28 +cursor-theme=Bibata-Modern-Classic +cursor-size=22 toolbar-style=both-horiz toolbar-icons-size=small font-hinting=slight diff --git a/README-ru.md b/README-ru.md index f0beee5..f144790 100644 --- a/README-ru.md +++ b/README-ru.md @@ -134,26 +134,26 @@
Утилиты и инструменты -| Пакет | Описание | -| :----------------------- | :------------------------------------ | -| `base-devel` | Инструменты разработки для сборок AUR | -| `brightnessctl` | Управление яркостью экрана | -| `fastfetch` | Просмотр информации о системе | -| `flameshot` | Утилита для создания скриншотов | -| `git` | Система контроля версий | -| `gpu-screen-recorder` | Запись экрана с ускорением GPU | -| `grim` | Утилита для скриншотов Wayland | -| `imagemagick` | Инструменты для работы с изображениями| -| `lsd` | Альтернатива `ls` с иконками | -| `nautilus` | Файловый менеджер | -| `network-manager-applet` | Апплет для управления сетью | -| `pavucontrol` | GUI для управления звуком | -| `playerctl` | Управление медиаплеерами | -| `trash-cli` | Утилита корзины командной строки | -| `uwsm` | Менеджер сессий Wayland | -| `wl-clip-persist` | Сохранение содержимого буфера обмена | -| `wl-clipboard` | Утилиты буфера обмена Wayland | -| `yay` | AUR-хелпер | +| Пакет | Описание | +| :----------------------- | :------------------------------------- | +| `base-devel` | Инструменты разработки для сборок AUR | +| `brightnessctl` | Управление яркостью экрана | +| `fastfetch` | Просмотр информации о системе | +| `flameshot` | Утилита для создания скриншотов | +| `git` | Система контроля версий | +| `gpu-screen-recorder` | Запись экрана с ускорением GPU | +| `grim` | Утилита для скриншотов Wayland | +| `imagemagick` | Инструменты для работы с изображениями | +| `lsd` | Альтернатива `ls` с иконками | +| `nautilus` | Файловый менеджер | +| `network-manager-applet` | Апплет для управления сетью | +| `pavucontrol` | GUI для управления звуком | +| `playerctl` | Управление медиаплеерами | +| `trash-cli` | Утилита корзины командной строки | +| `uwsm` | Менеджер сессий Wayland | +| `wl-clip-persist` | Сохранение содержимого буфера обмена | +| `wl-clipboard` | Утилиты буфера обмена Wayland | +| `yay` | AUR-хелпер |
@@ -195,7 +195,6 @@ | `papirus-icon-theme` | Тема иконок Papirus | | `qt5ct-kde` | Настройка тем Qt5 | | `qt6ct-kde` | Настройка тем Qt6 | -| `rose-pine-cursor` | Тема курсора Rosé Pine | | `rose-pine-hyprcursor` | Тема курсора Rosé Pine для Hyprland | | `ttf-jetbrains-mono-nerd` | JetBrains Mono с Nerd-глифами | | `ttf-meslo-nerd-font-powerlevel10k` | Шрифт Meslo Nerd для Powerlevel10k | @@ -330,12 +329,15 @@ sudo pacman -S papirus-icon-theme ## Курсор -https://github.com/rose-pine/cursor +https://github.com/ful1e5/Bibata_Cursor -https://github.com/ndom91/rose-pine-hyprcursor +Скрипт установки устанавливает курсор [`Bibata-Modern-Classic`](https://github.com/ful1e5/Bibata_Cursor/releases/tag/v2.0.7). ``` -yay -S rose-pine-cursor rose-pine-hyprcursor +mkdir -p /tmp/bibata +curl -L https://github.com/ful1e5/Bibata_Cursor/releases/download/v2.0.7/Bibata-Modern-Classic.tar.xz -o /tmp/bibata/bibata.tar.xz +tar -xf /tmp/bibata/bibata.tar.xz -C /tmp/bibata +sudo cp -r /tmp/bibata/Bibata-Modern-Classic /usr/share/icons/ ``` ## Шрифты diff --git a/README.md b/README.md index 83c04c2..fce9116 100644 --- a/README.md +++ b/README.md @@ -195,7 +195,6 @@ Packages installed by [`install.sh`](./Scripts/install.sh). | `papirus-icon-theme` | Papirus icon theme | | `qt5ct-kde` | Qt5 theme configuration | | `qt6ct-kde` | Qt6 theme configuration | -| `rose-pine-cursor` | Rosé Pine cursor theme | | `rose-pine-hyprcursor` | Rosé Pine cursor theme for Hyprland | | `ttf-jetbrains-mono-nerd` | JetBrains Mono with Nerd glyphs | | `ttf-meslo-nerd-font-powerlevel10k` | Meslo Nerd font for Powerlevel10k | @@ -331,12 +330,15 @@ sudo pacman -S papirus-icon-theme ## Cursor -https://github.com/rose-pine/cursor +https://github.com/ful1e5/Bibata_Cursor -https://github.com/ndom91/rose-pine-hyprcursor +The [installation script](./Scripts/install.sh) installs the [`Bibata-Modern-Classic`](https://github.com/ful1e5/Bibata_Cursor/releases/tag/v2.0.7) cursor theme. ``` -yay -S rose-pine-cursor rose-pine-hyprcursor +mkdir -p /tmp/bibata +curl -L https://github.com/ful1e5/Bibata_Cursor/releases/download/v2.0.7/Bibata-Modern-Classic.tar.xz -o /tmp/bibata/bibata.tar.xz +tar -xf /tmp/bibata/bibata.tar.xz -C /tmp/bibata +sudo cp -r /tmp/bibata/Bibata-Modern-Classic /usr/share/icons/ ``` ## Fonts diff --git a/Scripts/install.sh b/Scripts/install.sh index 3b861ef..b3bb482 100755 --- a/Scripts/install.sh +++ b/Scripts/install.sh @@ -134,6 +134,23 @@ ensure_yay() { fi } +# Install Bibata cursor +install_bibata_cursor() { + print_section "Installing Bibata cursor" + + echo -e "${BLUE}Installing Bibata cursor...${RESET}" + local tmp_dir + tmp_dir=$(mktemp -d) + if curl -L "https://github.com/ful1e5/Bibata_Cursor/releases/download/v2.0.7/Bibata-Modern-Classic.tar.xz" -o "$tmp_dir/bibata.tar.xz"; then + tar -xf "$tmp_dir/bibata.tar.xz" -C "$tmp_dir" + sudo cp -r "$tmp_dir/Bibata-Modern-Classic" /usr/share/icons/ + echo -e "${GREEN}Bibata cursor installed.${RESET}" + else + echo -e "${RED}Failed to download Bibata cursor.${RESET}" + fi + rm -rf "$tmp_dir" +} + # Setup Zsh, Oh My Zsh and plugins setup_zsh() { if [ ! -d "$HOME/.oh-my-zsh" ]; then @@ -323,7 +340,7 @@ main() { install_yay waypaper wlogout vicinae-bin print_section "Utilities and tools" - install_pacman brightnessctl imagemagick fastfetch grim lsd pavucontrol playerctl trash-cli uwsm wl-clipboard wl-clip-persist + install_pacman brightnessctl imagemagick fastfetch grim tar lsd pavucontrol playerctl trash-cli uwsm wl-clipboard wl-clip-persist git clone https://github.com/flameshot-org/flameshot "$HOME/.cache/yay/flameshot-git/flameshot" install_yay flameshot-git gpu-screen-recorder nautilus network-manager-applet @@ -332,7 +349,8 @@ main() { print_section "Appearance and themes" install_pacman adw-gtk-theme frameworkintegration inter-font noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-extra papirus-icon-theme ttf-jetbrains-mono-nerd - install_yay matugen-bin qt5ct-kde qt6ct-kde darkly-bin rose-pine-cursor rose-pine-hyprcursor ttf-meslo-nerd-font-powerlevel10k + install_yay matugen-bin qt5ct-kde qt6ct-kde darkly-bin ttf-meslo-nerd-font-powerlevel10k + install_bibata_cursor print_section "Zsh and Plugins" install_pacman zsh