This commit is contained in:
2026-06-03 02:40:21 +02:00
parent b3194e66e2
commit 003871b089
12 changed files with 46 additions and 103 deletions
+1 -33
View File
@@ -4,38 +4,12 @@ AccessModifierOffset: -2
AlignConsecutiveAssignments: true AlignConsecutiveAssignments: true
AllowAllArgumentsOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: true AllowShortCaseLabelsOnASingleLine: true
AllowShortFunctionsOnASingleLine: Inline
AllowShortLambdasOnASingleLine: All
# BreakAfterReturnType: All
BinPackArguments: false BinPackArguments: false
BinPackParameters: false BinPackParameters: false
ColumnLimit: 0
CompactNamespaces: false
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
EmptyLineBeforeAccessModifier: LogicalBlock
FixNamespaceComments: true
IncludeBlocks: Regroup
SortIncludes: true
IncludeCategories: IncludeCategories:
- Regex: '^<ext/.*\.h>' - Regex: '^<ext/.*\.h>'
Priority: 2 Priority: 2
@@ -48,16 +22,10 @@ IncludeCategories:
IndentWidth: 4 IndentWidth: 4
KeepEmptyLinesAtTheStartOfBlocks: true
InsertNewlineAtEOF: true InsertNewlineAtEOF: true
MaxEmptyLinesToKeep: 1
TabWidth: 4 TabWidth: 4
UseTab: Never
SeparateDefinitionBlocks: Always SeparateDefinitionBlocks: Always
QualifierAlignment: Left ColumnLimit: 0
+8 -17
View File
@@ -1,26 +1,17 @@
[Settings] [Settings]
gtk-application-prefer-dark-theme=true gtk-theme-name=catppuccin-mocha-blue-standard+default
gtk-button-images=true gtk-icon-theme-name=Papirus
gtk-cursor-blink=true gtk-font-name=Sarasa UI SC 10
gtk-cursor-blink-time=1000
gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-name=Bibata-Modern-Ice
gtk-cursor-theme-size=24 gtk-cursor-theme-size=24
gtk-decoration-layout=icon:minimize,maximize,close gtk-toolbar-style=GTK_TOOLBAR_ICONS
gtk-enable-animations=true gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
gtk-button-images=0
gtk-menu-images=0
gtk-enable-event-sounds=1 gtk-enable-event-sounds=1
gtk-enable-input-feedback-sounds=0 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-antialias=1
gtk-xft-dpi=122880
gtk-xft-hinting=1 gtk-xft-hinting=1
gtk-xft-hintstyle=hintslight gtk-xft-hintstyle=hintslight
gtk-xft-rgba=rgb gtk-xft-rgba=rgb
gtk-application-prefer-dark-theme=1
+4 -11
View File
@@ -1,14 +1,7 @@
[Settings] [Settings]
gtk-application-prefer-dark-theme=true gtk-theme-name=catppuccin-mocha-blue-standard+default
gtk-cursor-blink=true gtk-icon-theme-name=Papirus
gtk-cursor-blink-time=1000 gtk-font-name=Sarasa UI SC 10
gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-name=Bibata-Modern-Ice
gtk-cursor-theme-size=24 gtk-cursor-theme-size=24
gtk-decoration-layout=icon:minimize,maximize,close gtk-application-prefer-dark-theme=1
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
+3 -3
View File
@@ -36,8 +36,8 @@ ITERM2_EXPECTED_RESPONSE=$(printf "\033]1337;") # followed by "ReportCellSize=..
FENCE_CODE=$(printf "\033[c") FENCE_CODE=$(printf "\033[c")
# Set terminal to raw mode with timeout # Set terminal to raw mode with timeout
stty_orig=$(stty -g) stty_orig=$(stty -g < /dev/tty)
trap 'stty "$stty_orig"' EXIT INT TERM HUP trap 'stty "$stty_orig" < /dev/tty' EXIT INT TERM HUP
stty -echo -icanon min 1 time 0 stty -echo -icanon min 1 time 0
printf "%s%s%s" "$ITERM2_QUERY_CODE" "$KGP_QUERY_CODE" "$FENCE_CODE" > /dev/tty printf "%s%s%s" "$ITERM2_QUERY_CODE" "$KGP_QUERY_CODE" "$FENCE_CODE" > /dev/tty
@@ -48,7 +48,7 @@ support_sixel=0
response="" response=""
while true; do while true; do
IFS= read -r -N 1 -t "$TIMEOUT" char || { IFS= read -r -N 1 -t "$TIMEOUT" char < /dev/tty || {
[ -z "$char" ] && break [ -z "$char" ] && break
} }
+3 -3
View File
@@ -14,8 +14,8 @@ EXPECTED_RESPONSE=$(printf "\033]1337;") # followed by "ReportCellSize=...", but
FENCE_CODE=$(printf "\033[c") FENCE_CODE=$(printf "\033[c")
# Set terminal to raw mode # Set terminal to raw mode
stty_orig=$(stty -g) stty_orig=$(stty -g < /dev/tty)
trap 'stty "$stty_orig"' EXIT INT TERM HUP trap 'stty "$stty_orig" < /dev/tty' EXIT INT TERM HUP
stty -echo -icanon min 1 time 0 stty -echo -icanon min 1 time 0
printf "%s%s" "$QUERY_CODE" "$FENCE_CODE" > /dev/tty printf "%s%s" "$QUERY_CODE" "$FENCE_CODE" > /dev/tty
@@ -23,7 +23,7 @@ printf "%s%s" "$QUERY_CODE" "$FENCE_CODE" > /dev/tty
response="" response=""
ret=1 ret=1
while true; do 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 [ -z "$char" ] && break
} }
+3 -3
View File
@@ -17,8 +17,8 @@ EXPECTED_RESPONSE=$(printf "\033_Gi=%d;OK\033\\" "$QUERY_ID")
FENCE_CODE=$(printf "\033[c") FENCE_CODE=$(printf "\033[c")
# Set terminal to raw mode with timeout # Set terminal to raw mode with timeout
stty_orig=$(stty -g) stty_orig=$(stty -g < /dev/tty)
trap 'stty "$stty_orig"' EXIT INT TERM HUP trap 'stty "$stty_orig" < /dev/tty' EXIT INT TERM HUP
stty -echo -icanon min 1 time 0 stty -echo -icanon min 1 time 0
printf "%s%s" "$QUERY_CODE" "$FENCE_CODE" > /dev/tty printf "%s%s" "$QUERY_CODE" "$FENCE_CODE" > /dev/tty
@@ -26,7 +26,7 @@ printf "%s%s" "$QUERY_CODE" "$FENCE_CODE" > /dev/tty
response="" response=""
ret=1 ret=1
while true; do 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 [ -z "$char" ] && break
} }
+3 -3
View File
@@ -9,15 +9,15 @@ set -euo pipefail
QUERY_CODE=$(printf "\033[c") QUERY_CODE=$(printf "\033[c")
# Set terminal to raw mode with timeout as 0.5s # Set terminal to raw mode with timeout as 0.5s
stty_orig=$(stty -g) stty_orig=$(stty -g < /dev/tty)
trap 'stty "$stty_orig"' EXIT INT TERM HUP trap 'stty "$stty_orig" < /dev/tty' EXIT INT TERM HUP
stty -echo -icanon min 1 time 0 stty -echo -icanon min 1 time 0
printf "%s" "$QUERY_CODE" >/dev/tty printf "%s" "$QUERY_CODE" >/dev/tty
response="" response=""
while true; do 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 [ -z "$char" ] && break
} }
+4 -4
View File
@@ -1,11 +1,11 @@
[[plugin.deps]] [[plugin.deps]]
use = "yazi-rs/plugins:git" use = "yazi-rs/plugins:git"
rev = "598cdb6" rev = "b9946d9"
hash = "88e56a64b7ce7c4314427452343fef17" hash = "88e56a64b7ce7c4314427452343fef17"
[[plugin.deps]] [[plugin.deps]]
use = "yazi-rs/plugins:smart-enter" use = "yazi-rs/plugins:smart-enter"
rev = "598cdb6" rev = "b9946d9"
hash = "187cc58ba7ac3befd49c342129e6f1b6" hash = "187cc58ba7ac3befd49c342129e6f1b6"
[[plugin.deps]] [[plugin.deps]]
@@ -25,8 +25,8 @@ hash = "5c7802a9ac249be88729978e3b9525bc"
[[plugin.deps]] [[plugin.deps]]
use = "Rolv-Apneseth/starship" use = "Rolv-Apneseth/starship"
rev = "a837101" rev = "159eaba"
hash = "635b0feb9215772d22020eb0abf0bb34" hash = "7de446280b1ba8c49ffd86dbc24bbbe6"
[flavor] [flavor]
deps = [] deps = []
@@ -71,7 +71,7 @@ local old_build = Tab.build
Tab.build = function(self, ...) Tab.build = function(self, ...)
local bar = function(c, x, y) local bar = function(c, x, y)
if x <= 0 or x == self._area.w - 1 then 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 end
return ui.Bar(ui.Edge.TOP) return ui.Bar(ui.Edge.TOP)
@@ -87,15 +87,15 @@ Tab.build = function(self, ...)
local c = self._chunks local c = self._chunks
self._chunks = { self._chunks = {
c[1]:pad(ui.Pad.y(1)), 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)), c[3]:pad(ui.Pad.y(1)),
} }
self._base = ya.list_merge(self._base or {}, { self._base = ya.list_merge(self._base or {}, {
bar("", c[1].right - 1, c[1].y), bar("", c[2].x, c[1].y),
bar("", c[1].right - 1, c[1].bottom - 1), bar("", c[2].x, c[1].bottom - 1),
bar("", c[2].right, c[2].y), bar("", c[2].right - 1, c[2].y),
bar("", c[2].right, c[2].bottom - 1), bar("", c[2].right - 1, c[2].bottom - 1),
}) })
old_build(self, ...) old_build(self, ...)
+1 -1
View File
@@ -22,7 +22,7 @@
> sudo bsdtar -xpf ArchLinuxARM-aarch64-latest.tar.gz -C /var/lib/machines/{{ rootfs-name }} > 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 > ```conf
> [options] > [options]
+5 -7
View File
@@ -1,18 +1,18 @@
### Font packages (involved in fontconfig) ### Font packages (involved in fontconfig)
- `aur/ttf-symbola`
- `extra/noto-fonts` - `extra/noto-fonts`
- `extra/noto-fonts-cjk` - `extra/noto-fonts-cjk`
- `extra/noto-fonts-emoji` - `extra/noto-fonts-emoji`
- `extra/ttf-nerd-fonts-symbols` - `extra/ttf-nerd-fonts-symbols`
- `aur/maplemono-nf-cn` - `aur/maplemono-nf-cn`
- `aur/ttf-lxgw-wenkai`
- `aur/ttf-symbola`
### Other fonts (used but not involved in fontconfig) ### Other fonts (used but not involved in fontconfig)
- Sour Gummy (from [Google Fonts](https://fonts.google.com/specimen/Sour+Gummy)) - [Sour Gummy](https://fonts.google.com/specimen/Sour+Gummy): used in quickshell
- Font Awesome 6 Free (extracted from an AUR package that no longer exists) - Font Awesome 6 Free: used in waybar & some other desktop components
- `extra/ttf-meslo-nerd` - `extra/ttf-meslo-nerd`: for its `Mono` variant, nerd-font icons with 1-cell width
- `archlinuxcn/ttf-lxgw-wenkai`
### Font configuration ### Font configuration
@@ -38,7 +38,6 @@
<alias> <alias>
<family>sans-serif</family> <family>sans-serif</family>
<prefer> <prefer>
<!-- <family>LXGW WenKai</family> -->
<family>Noto Sans</family> <family>Noto Sans</family>
<family>Noto Sans CJK SC</family> <family>Noto Sans CJK SC</family>
<family>Noto Sans CJK JP</family> <family>Noto Sans CJK JP</family>
@@ -77,7 +76,6 @@
<alias> <alias>
<family>monospace</family> <family>monospace</family>
<prefer> <prefer>
<!-- <family>ComicShanns Nerd Font</family> -->
<family>Maple Mono NF CN</family> <family>Maple Mono NF CN</family>
<family>Noto Sans Mono</family> <family>Noto Sans Mono</family>
<family>Noto Sans Mono CJK SC</family> <family>Noto Sans Mono CJK SC</family>
+5 -12
View File
@@ -98,7 +98,6 @@ bash /path/to/dotfiles/memo/packages.md
``` ```
7zip 7zip
aarch64-linux-gnu-gcc
alacritty alacritty
alass alass
arch-install-scripts arch-install-scripts
@@ -109,7 +108,6 @@ ark
av1an av1an
awww awww
axel axel
azure-cli
base base
base-devel base-devel
bash-completion bash-completion
@@ -122,7 +120,6 @@ bluez-utils
bootconfig bootconfig
bpf bpf
bpftrace bpftrace
bridge-utils
brightnessctl brightnessctl
bsd-games bsd-games
btop btop
@@ -160,12 +157,15 @@ cython
deno deno
devtools devtools
digital digital
discord
dnsmasq dnsmasq
docker docker
docker-buildx
docker-compose docker-compose
dolphin dolphin
dotnet-sdk dotnet-sdk
doxygen doxygen
drawio-desktop
drm-info drm-info
dwarfs dwarfs
ed ed
@@ -232,6 +232,7 @@ grim
grub grub
grub-btrfs grub-btrfs
gst-plugins-bad gst-plugins-bad
gtkwave
gucharmap gucharmap
gvfs-smb gvfs-smb
gwenview gwenview
@@ -294,7 +295,6 @@ libva-intel-driver
libva-nvidia-driver libva-nvidia-driver
libva-utils libva-utils
libvips libvips
libvirt
lightdm lightdm
linux-cachyos linux-cachyos
linux-cachyos-headers linux-cachyos-headers
@@ -325,9 +325,7 @@ mpd
mpd-mpris mpd-mpris
mpv-full mpv-full
mpv-mpris mpv-mpris
msedit
namcap namcap
nano
nasm nasm
nautilus nautilus
nautilus-share nautilus-share
@@ -354,10 +352,8 @@ obs-studio
obsidian obsidian
okular okular
opam opam
openbsd-netcat
opencl-headers opencl-headers
opencl-nvidia opencl-nvidia
openlist-bin
openssh openssh
os-prober os-prober
pacman-contrib pacman-contrib
@@ -423,6 +419,7 @@ qt6-serialbus
qt6ct qt6ct
qtcreator qtcreator
qtrvsim qtrvsim
quickemu
quickshell-git quickshell-git
qutebrowser qutebrowser
rclone rclone
@@ -515,8 +512,6 @@ ventoy-bin
vesktop-bin vesktop-bin
vicinae vicinae
vim vim
virt-install
virt-manager
visual-studio-code-bin visual-studio-code-bin
vk-hdr-layer-kwin6-git vk-hdr-layer-kwin6-git
vlc vlc
@@ -589,14 +584,12 @@ xpadneo-dkms
xwayland-satellite xwayland-satellite
yad yad
yay yay
yay-debug
yazi yazi
yt-dlp yt-dlp
zellij zellij
zen-browser-bin zen-browser-bin
zenity zenity
zig zig
zig0.15-bin
zoxide zoxide
zram-generator zram-generator
zsh zsh