From 003871b089dd46c02cbf08f43c9177c1db255d0b Mon Sep 17 00:00:00 2001 From: Uyanide Date: Wed, 3 Jun 2026 02:40:21 +0200 Subject: [PATCH] update --- config/clang/.clang-format | 34 +------------------ config/nwg-look/.config/gtk-3.0/settings.ini | 25 +++++--------- config/nwg-look/.config/gtk-4.0/settings.ini | 15 +++----- config/scripts/.local/scripts/graphics-query | 6 ++-- config/scripts/.local/scripts/iterm2-query | 6 ++-- config/scripts/.local/scripts/kgp-query | 6 ++-- config/scripts/.local/scripts/sixel-query | 6 ++-- config/yazi/.config/yazi/package.toml | 8 ++--- .../yazi/plugins/starship.yazi/README.md | 12 +++---- memo/alarm-qemu.md | 2 +- memo/fontconfig.md | 12 +++---- memo/packages.md | 17 +++------- 12 files changed, 46 insertions(+), 103 deletions(-) diff --git a/config/clang/.clang-format b/config/clang/.clang-format index 467b96e..a04a11d 100755 --- a/config/clang/.clang-format +++ b/config/clang/.clang-format @@ -4,38 +4,12 @@ AccessModifierOffset: -2 AlignConsecutiveAssignments: true -AllowAllArgumentsOnNextLine: false - -AllowAllParametersOfDeclarationOnNextLine: false - -AllowShortBlocksOnASingleLine: Empty - AllowShortCaseLabelsOnASingleLine: true -AllowShortFunctionsOnASingleLine: Inline - -AllowShortLambdasOnASingleLine: All - -# BreakAfterReturnType: All - BinPackArguments: false BinPackParameters: false -ColumnLimit: 0 - -CompactNamespaces: false - -ContinuationIndentWidth: 4 - -Cpp11BracedListStyle: true - -EmptyLineBeforeAccessModifier: LogicalBlock - -FixNamespaceComments: true - -IncludeBlocks: Regroup -SortIncludes: true IncludeCategories: - Regex: '^' Priority: 2 @@ -48,16 +22,10 @@ IncludeCategories: IndentWidth: 4 -KeepEmptyLinesAtTheStartOfBlocks: true - InsertNewlineAtEOF: true -MaxEmptyLinesToKeep: 1 - TabWidth: 4 -UseTab: Never - SeparateDefinitionBlocks: Always -QualifierAlignment: Left +ColumnLimit: 0 diff --git a/config/nwg-look/.config/gtk-3.0/settings.ini b/config/nwg-look/.config/gtk-3.0/settings.ini index 4831780..a2e43ec 100644 --- a/config/nwg-look/.config/gtk-3.0/settings.ini +++ b/config/nwg-look/.config/gtk-3.0/settings.ini @@ -1,26 +1,17 @@ [Settings] -gtk-application-prefer-dark-theme=true -gtk-button-images=true -gtk-cursor-blink=true -gtk-cursor-blink-time=1000 +gtk-theme-name=catppuccin-mocha-blue-standard+default +gtk-icon-theme-name=Papirus +gtk-font-name=Sarasa UI SC 10 gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-size=24 -gtk-decoration-layout=icon:minimize,maximize,close -gtk-enable-animations=true +gtk-toolbar-style=GTK_TOOLBAR_ICONS +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=0 +gtk-menu-images=0 gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=0 -gtk-font-name=Sarasa UI SC, 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 4139029..af17726 100644 --- a/config/nwg-look/.config/gtk-4.0/settings.ini +++ b/config/nwg-look/.config/gtk-4.0/settings.ini @@ -1,14 +1,7 @@ [Settings] -gtk-application-prefer-dark-theme=true -gtk-cursor-blink=true -gtk-cursor-blink-time=1000 +gtk-theme-name=catppuccin-mocha-blue-standard+default +gtk-icon-theme-name=Papirus +gtk-font-name=Sarasa UI SC 10 gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-size=24 -gtk-decoration-layout=icon:minimize,maximize,close -gtk-enable-animations=true -gtk-font-name=Sarasa UI SC, 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 +gtk-application-prefer-dark-theme=1 diff --git a/config/scripts/.local/scripts/graphics-query b/config/scripts/.local/scripts/graphics-query index 7bdacfa..6eaedcf 100755 --- a/config/scripts/.local/scripts/graphics-query +++ b/config/scripts/.local/scripts/graphics-query @@ -36,8 +36,8 @@ ITERM2_EXPECTED_RESPONSE=$(printf "\033]1337;") # followed by "ReportCellSize=.. FENCE_CODE=$(printf "\033[c") # Set terminal to raw mode with timeout -stty_orig=$(stty -g) -trap 'stty "$stty_orig"' EXIT INT TERM HUP +stty_orig=$(stty -g < /dev/tty) +trap 'stty "$stty_orig" < /dev/tty' EXIT INT TERM HUP stty -echo -icanon min 1 time 0 printf "%s%s%s" "$ITERM2_QUERY_CODE" "$KGP_QUERY_CODE" "$FENCE_CODE" > /dev/tty @@ -48,7 +48,7 @@ support_sixel=0 response="" while true; do - IFS= read -r -N 1 -t "$TIMEOUT" char || { + IFS= read -r -N 1 -t "$TIMEOUT" char < /dev/tty || { [ -z "$char" ] && break } diff --git a/config/scripts/.local/scripts/iterm2-query b/config/scripts/.local/scripts/iterm2-query index f7893c6..c064fe7 100755 --- a/config/scripts/.local/scripts/iterm2-query +++ b/config/scripts/.local/scripts/iterm2-query @@ -14,8 +14,8 @@ EXPECTED_RESPONSE=$(printf "\033]1337;") # followed by "ReportCellSize=...", but FENCE_CODE=$(printf "\033[c") # Set terminal to raw mode -stty_orig=$(stty -g) -trap 'stty "$stty_orig"' EXIT INT TERM HUP +stty_orig=$(stty -g < /dev/tty) +trap 'stty "$stty_orig" < /dev/tty' EXIT INT TERM HUP stty -echo -icanon min 1 time 0 printf "%s%s" "$QUERY_CODE" "$FENCE_CODE" > /dev/tty @@ -23,7 +23,7 @@ printf "%s%s" "$QUERY_CODE" "$FENCE_CODE" > /dev/tty response="" ret=1 while true; do - IFS= read -r -N 1 -t 0.3 char || { + IFS= read -r -N 1 -t 0.3 char < /dev/tty || { [ -z "$char" ] && break } diff --git a/config/scripts/.local/scripts/kgp-query b/config/scripts/.local/scripts/kgp-query index f8b48ea..d350c75 100755 --- a/config/scripts/.local/scripts/kgp-query +++ b/config/scripts/.local/scripts/kgp-query @@ -17,8 +17,8 @@ EXPECTED_RESPONSE=$(printf "\033_Gi=%d;OK\033\\" "$QUERY_ID") FENCE_CODE=$(printf "\033[c") # Set terminal to raw mode with timeout -stty_orig=$(stty -g) -trap 'stty "$stty_orig"' EXIT INT TERM HUP +stty_orig=$(stty -g < /dev/tty) +trap 'stty "$stty_orig" < /dev/tty' EXIT INT TERM HUP stty -echo -icanon min 1 time 0 printf "%s%s" "$QUERY_CODE" "$FENCE_CODE" > /dev/tty @@ -26,7 +26,7 @@ printf "%s%s" "$QUERY_CODE" "$FENCE_CODE" > /dev/tty response="" ret=1 while true; do - IFS= read -r -N 1 -t 0.3 char || { + IFS= read -r -N 1 -t 0.3 char < /dev/tty || { [ -z "$char" ] && break } diff --git a/config/scripts/.local/scripts/sixel-query b/config/scripts/.local/scripts/sixel-query index 1cf87e1..3a37da4 100755 --- a/config/scripts/.local/scripts/sixel-query +++ b/config/scripts/.local/scripts/sixel-query @@ -9,15 +9,15 @@ set -euo pipefail QUERY_CODE=$(printf "\033[c") # Set terminal to raw mode with timeout as 0.5s -stty_orig=$(stty -g) -trap 'stty "$stty_orig"' EXIT INT TERM HUP +stty_orig=$(stty -g < /dev/tty) +trap 'stty "$stty_orig" < /dev/tty' EXIT INT TERM HUP stty -echo -icanon min 1 time 0 printf "%s" "$QUERY_CODE" >/dev/tty response="" while true; do - IFS= read -r -N 1 -t 0.3 char || { + IFS= read -r -N 1 -t 0.3 char < /dev/tty || { [ -z "$char" ] && break } diff --git a/config/yazi/.config/yazi/package.toml b/config/yazi/.config/yazi/package.toml index 6f29632..28b8cb8 100644 --- a/config/yazi/.config/yazi/package.toml +++ b/config/yazi/.config/yazi/package.toml @@ -1,11 +1,11 @@ [[plugin.deps]] use = "yazi-rs/plugins:git" -rev = "598cdb6" +rev = "b9946d9" hash = "88e56a64b7ce7c4314427452343fef17" [[plugin.deps]] use = "yazi-rs/plugins:smart-enter" -rev = "598cdb6" +rev = "b9946d9" hash = "187cc58ba7ac3befd49c342129e6f1b6" [[plugin.deps]] @@ -25,8 +25,8 @@ hash = "5c7802a9ac249be88729978e3b9525bc" [[plugin.deps]] use = "Rolv-Apneseth/starship" -rev = "a837101" -hash = "635b0feb9215772d22020eb0abf0bb34" +rev = "159eaba" +hash = "7de446280b1ba8c49ffd86dbc24bbbe6" [flavor] deps = [] diff --git a/config/yazi/.config/yazi/plugins/starship.yazi/README.md b/config/yazi/.config/yazi/plugins/starship.yazi/README.md index 59b470a..5d91a3b 100644 --- a/config/yazi/.config/yazi/plugins/starship.yazi/README.md +++ b/config/yazi/.config/yazi/plugins/starship.yazi/README.md @@ -71,7 +71,7 @@ local old_build = Tab.build Tab.build = function(self, ...) local bar = function(c, x, y) if x <= 0 or x == self._area.w - 1 then - return ui.Bar(ui.Edge.TOP):area(ui.Rect.default) + return ui.Bar(ui.Edge.TOP) end return ui.Bar(ui.Edge.TOP) @@ -87,15 +87,15 @@ Tab.build = function(self, ...) local c = self._chunks self._chunks = { c[1]:pad(ui.Pad.y(1)), - c[2]:pad(ui.Pad(1, c[3].w > 0 and 0 or 1, 1, c[1].w > 0 and 0 or 1)), + c[2]:pad(ui.Pad.y(1)), c[3]:pad(ui.Pad.y(1)), } self._base = ya.list_merge(self._base or {}, { - bar("┬", c[1].right - 1, c[1].y), - bar("┴", c[1].right - 1, c[1].bottom - 1), - bar("┬", c[2].right, c[2].y), - bar("┴", c[2].right, c[2].bottom - 1), + bar("┬", c[2].x, c[1].y), + bar("┴", c[2].x, c[1].bottom - 1), + bar("┬", c[2].right - 1, c[2].y), + bar("┴", c[2].right - 1, c[2].bottom - 1), }) old_build(self, ...) diff --git a/memo/alarm-qemu.md b/memo/alarm-qemu.md index 81a407e..0937ea6 100644 --- a/memo/alarm-qemu.md +++ b/memo/alarm-qemu.md @@ -22,7 +22,7 @@ > sudo bsdtar -xpf ArchLinuxARM-aarch64-latest.tar.gz -C /var/lib/machines/{{ rootfs-name }} > ``` > -> 解压的 aarch64 架构的 archlinux rootfs. 但要不要提醒用户应该取消注释 `cat /etc/pacman.conf` 中的 +> 解压的 aarch64 架构的 archlinux rootfs. 但要不要提醒用户应该取消注释 `/etc/pacman.conf` 中的 > > ```conf > [options] diff --git a/memo/fontconfig.md b/memo/fontconfig.md index 568f8fe..177c227 100644 --- a/memo/fontconfig.md +++ b/memo/fontconfig.md @@ -1,18 +1,18 @@ ### Font packages (involved in fontconfig) -- `aur/ttf-symbola` - `extra/noto-fonts` - `extra/noto-fonts-cjk` - `extra/noto-fonts-emoji` - `extra/ttf-nerd-fonts-symbols` - `aur/maplemono-nf-cn` +- `aur/ttf-lxgw-wenkai` +- `aur/ttf-symbola` ### Other fonts (used but not involved in fontconfig) -- Sour Gummy (from [Google Fonts](https://fonts.google.com/specimen/Sour+Gummy)) -- Font Awesome 6 Free (extracted from an AUR package that no longer exists) -- `extra/ttf-meslo-nerd` -- `archlinuxcn/ttf-lxgw-wenkai` +- [Sour Gummy](https://fonts.google.com/specimen/Sour+Gummy): used in quickshell +- Font Awesome 6 Free: used in waybar & some other desktop components +- `extra/ttf-meslo-nerd`: for its `Mono` variant, nerd-font icons with 1-cell width ### Font configuration @@ -38,7 +38,6 @@ sans-serif - Noto Sans Noto Sans CJK SC Noto Sans CJK JP @@ -77,7 +76,6 @@ monospace - Maple Mono NF CN Noto Sans Mono Noto Sans Mono CJK SC diff --git a/memo/packages.md b/memo/packages.md index 59c93c1..44eec30 100644 --- a/memo/packages.md +++ b/memo/packages.md @@ -98,7 +98,6 @@ bash /path/to/dotfiles/memo/packages.md ``` 7zip -aarch64-linux-gnu-gcc alacritty alass arch-install-scripts @@ -109,7 +108,6 @@ ark av1an awww axel -azure-cli base base-devel bash-completion @@ -122,7 +120,6 @@ bluez-utils bootconfig bpf bpftrace -bridge-utils brightnessctl bsd-games btop @@ -160,12 +157,15 @@ cython deno devtools digital +discord dnsmasq docker +docker-buildx docker-compose dolphin dotnet-sdk doxygen +drawio-desktop drm-info dwarfs ed @@ -232,6 +232,7 @@ grim grub grub-btrfs gst-plugins-bad +gtkwave gucharmap gvfs-smb gwenview @@ -294,7 +295,6 @@ libva-intel-driver libva-nvidia-driver libva-utils libvips -libvirt lightdm linux-cachyos linux-cachyos-headers @@ -325,9 +325,7 @@ mpd mpd-mpris mpv-full mpv-mpris -msedit namcap -nano nasm nautilus nautilus-share @@ -354,10 +352,8 @@ obs-studio obsidian okular opam -openbsd-netcat opencl-headers opencl-nvidia -openlist-bin openssh os-prober pacman-contrib @@ -423,6 +419,7 @@ qt6-serialbus qt6ct qtcreator qtrvsim +quickemu quickshell-git qutebrowser rclone @@ -515,8 +512,6 @@ ventoy-bin vesktop-bin vicinae vim -virt-install -virt-manager visual-studio-code-bin vk-hdr-layer-kwin6-git vlc @@ -589,14 +584,12 @@ xpadneo-dkms xwayland-satellite yad yay -yay-debug yazi yt-dlp zellij zen-browser-bin zenity zig -zig0.15-bin zoxide zram-generator zsh