From 763013ae87b81cace534275e76b58e71d1b0a3ad Mon Sep 17 00:00:00 2001 From: Uyanide Date: Sat, 14 Mar 2026 04:34:04 +0100 Subject: [PATCH] update config-stow --- config/niri/.config/niri/config/misc.kdl | 2 +- config/nwg-look/.config/gtk-3.0/settings.ini | 25 +++++++---- config/nwg-look/.config/gtk-4.0/settings.ini | 15 +++++-- config/scripts/.local/scripts/config-switch | 44 +++++++++---------- config/wallpaper/.config/wallreel/config.json | 3 -- config/wallpaper/Pictures/backgrounds | 2 +- 6 files changed, 51 insertions(+), 40 deletions(-) diff --git a/config/niri/.config/niri/config/misc.kdl b/config/niri/.config/niri/config/misc.kdl index db5af45..8c18b91 100644 --- a/config/niri/.config/niri/config/misc.kdl +++ b/config/niri/.config/niri/config/misc.kdl @@ -1,7 +1,7 @@ screenshot-path "~/Pictures/Screenshots/niri_screenshot_%Y-%m-%d_%H-%M-%S.png" debug { - render-drm-device "/dev/dri/renderD128" + render-drm-device "/dev/dri/renderD129" } // gestures { diff --git a/config/nwg-look/.config/gtk-3.0/settings.ini b/config/nwg-look/.config/gtk-3.0/settings.ini index 47b5edf..6d84427 100644 --- a/config/nwg-look/.config/gtk-3.0/settings.ini +++ b/config/nwg-look/.config/gtk-3.0/settings.ini @@ -1,17 +1,26 @@ [Settings] -gtk-theme-name=catppuccin-mocha-blue-standard+default -gtk-icon-theme-name=Papirus -gtk-font-name=Noto Sans 10 +gtk-application-prefer-dark-theme=true +gtk-button-images=true +gtk-cursor-blink=true +gtk-cursor-blink-time=1000 gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-size=24 -gtk-toolbar-style=GTK_TOOLBAR_ICONS -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 -gtk-menu-images=0 +gtk-decoration-layout=icon:minimize,maximize,close +gtk-enable-animations=true gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=0 +gtk-font-name=Noto Sans, 10 +gtk-icon-theme-name=Papirus +gtk-menu-images=true +gtk-modules=colorreload-gtk-module:appmenu-gtk-module +gtk-primary-button-warps-slider=true +gtk-shell-shows-menubar=1 +gtk-sound-theme-name=ocean +gtk-theme-name=catppuccin-mocha-blue-standard+default +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-toolbar-style=3 gtk-xft-antialias=1 +gtk-xft-dpi=122880 gtk-xft-hinting=1 gtk-xft-hintstyle=hintslight gtk-xft-rgba=rgb -gtk-application-prefer-dark-theme=1 diff --git a/config/nwg-look/.config/gtk-4.0/settings.ini b/config/nwg-look/.config/gtk-4.0/settings.ini index ae04bc1..995a2b7 100644 --- a/config/nwg-look/.config/gtk-4.0/settings.ini +++ b/config/nwg-look/.config/gtk-4.0/settings.ini @@ -1,7 +1,14 @@ [Settings] -gtk-theme-name=catppuccin-mocha-blue-standard+default -gtk-icon-theme-name=Papirus -gtk-font-name=Noto Sans 10 +gtk-application-prefer-dark-theme=true +gtk-cursor-blink=true +gtk-cursor-blink-time=1000 gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-size=24 -gtk-application-prefer-dark-theme=1 +gtk-decoration-layout=icon:minimize,maximize,close +gtk-enable-animations=true +gtk-font-name=Noto Sans, 10 +gtk-icon-theme-name=Papirus +gtk-primary-button-warps-slider=true +gtk-sound-theme-name=ocean +gtk-theme-name=catppuccin-mocha-blue-standard+default +gtk-xft-dpi=122880 diff --git a/config/scripts/.local/scripts/config-switch b/config/scripts/.local/scripts/config-switch index fbf7689..cd95ac1 100755 --- a/config/scripts/.local/scripts/config-switch +++ b/config/scripts/.local/scripts/config-switch @@ -1,32 +1,30 @@ #!/usr/bin/env bash +set -euo pipefail + # Description: # Updates configurations of several apps according to the current (or given as parameter) desktop environment. -if [ -z "$1" ]; then - desktop="$XDG_CURRENT_DESKTOP" -else - desktop="$1" -fi +desktop=${1:-${XDG_CURRENT_DESKTOP:-default}} for item in "kitty" "wlogout"; do - if [ ! -L "$HOME/.config/$item" ] && [ -e "$HOME/.config/$item" ]; then - echo "Error: $HOME/.config/$item exists and is not a symlink." >&2 - exit 1 - elif [ -L "$HOME/.config/$item" ]; then - rm "$HOME/.config/$item" || { - echo "Error: Failed to remove existing symlink $HOME/.config/$item." >&2 - exit 1 - } - fi + if [ ! -L "$HOME/.config/$item" ] && [ -e "$HOME/.config/$item" ]; then + echo "Error: $HOME/.config/$item exists and is not a symlink." >&2 + exit 1 + elif [ -L "$HOME/.config/$item" ]; then + rm -f "$HOME/.config/$item" || { + echo "Error: Failed to remove existing symlink $HOME/.config/$item." >&2 + exit 1 + } + fi - if [ "$desktop" = "niri" ] || [ "$desktop" = "GNOME" ]; then - if [ -e "$HOME/.config/.alt/${item}-niri" ]; then - ln -svf ".alt/${item}-niri" "$HOME/.config/$item" - elif [ -e "$HOME/.config/.alt/${item}-default" ]; then - ln -svf ".alt/${item}-default" "$HOME/.config/$item" - fi - else - [ -e "$HOME/.config/.alt/${item}-default" ] && ln -svf ".alt/${item}-default" "$HOME/.config/$item" - fi + if [ "$desktop" = "niri" ] || [ "$desktop" = "GNOME" ]; then + if [ -e "$HOME/.config/.alt/${item}-niri" ]; then + ln -svf ".alt/${item}-niri" "$HOME/.config/$item" + elif [ -e "$HOME/.config/.alt/${item}-default" ]; then + ln -svf ".alt/${item}-default" "$HOME/.config/$item" + fi + else + [ -e "$HOME/.config/.alt/${item}-default" ] && ln -svf ".alt/${item}-default" "$HOME/.config/$item" + fi done diff --git a/config/wallpaper/.config/wallreel/config.json b/config/wallpaper/.config/wallreel/config.json index 0b7d4f6..f385423 100644 --- a/config/wallpaper/.config/wallreel/config.json +++ b/config/wallpaper/.config/wallreel/config.json @@ -4,9 +4,6 @@ "dirs": [ { "path": "~/Pictures/backgrounds" - }, - { - "path": "/media/Beta/壁纸/库" } ], "excludes": [ diff --git a/config/wallpaper/Pictures/backgrounds b/config/wallpaper/Pictures/backgrounds index 3554117..a694860 160000 --- a/config/wallpaper/Pictures/backgrounds +++ b/config/wallpaper/Pictures/backgrounds @@ -1 +1 @@ -Subproject commit 3554117fd0ca468acf9a0273d4a696841929819d +Subproject commit a694860bc15dea72c9acbded2c001655bdea3738