This commit is contained in:
2026-06-03 01:22:16 +02:00
parent 8aa0d0ff61
commit b3194e66e2
13 changed files with 90 additions and 34 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
theme = "catppuccin_mocha" theme = "catppuccin_mocha"
[editor] [editor]
default-yank-register = "+" # default-yank-register = "+"
shell = ["bash", "-c"] shell = ["bash", "-c"]
line-number = "relative" line-number = "relative"
indent-guides.render = true indent-guides.render = true
@@ -97,3 +97,12 @@ window-rule {
// open-maximized-to-edges true // open-maximized-to-edges true
// open-on-output "HDMI-A-1" // open-on-output "HDMI-A-1"
} }
// Steam toasts
window-rule {
match app-id="^steam$" title=r#"^notificationtoasts_\d+_desktop$"#
open-floating true
open-focused false
default-floating-position x=2 y=3 relative-to="bottom-right"
}
+17 -8
View File
@@ -1,17 +1,26 @@
[Settings] [Settings]
gtk-theme-name=catppuccin-mocha-blue-standard+default gtk-application-prefer-dark-theme=true
gtk-icon-theme-name=Papirus gtk-button-images=true
gtk-font-name=Sarasa UI SC 10 gtk-cursor-blink=true
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-toolbar-style=GTK_TOOLBAR_ICONS gtk-decoration-layout=icon:minimize,maximize,close
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-enable-animations=true
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
+11 -4
View File
@@ -1,7 +1,14 @@
[Settings] [Settings]
gtk-theme-name=catppuccin-mocha-blue-standard+default gtk-application-prefer-dark-theme=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-application-prefer-dark-theme=1 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
+6 -1
View File
@@ -72,7 +72,6 @@ cleanup() {
} }
trap cleanup EXIT INT TERM trap cleanup EXIT INT TERM
# --- Nested Partition Logic ---
OUTER_MOUNT_POINT="" OUTER_MOUNT_POINT=""
handle_nested_partition() { handle_nested_partition() {
local uuid="$1" local uuid="$1"
@@ -89,6 +88,11 @@ handle_nested_partition() {
echo "[INFO] Found outer device: $outer_device" >&2 echo "[INFO] Found outer device: $outer_device" >&2
# Check if already mounted
if findmnt -n "$outer_device" >/dev/null; then
echo "[INFO] Outer device is already mounted." >&2
OUTER_MOUNT_POINT=$(findmnt -n -o TARGET "$outer_device")
else
# Create a temporary mount point for the outer partition # Create a temporary mount point for the outer partition
OUTER_MOUNT_POINT=$(mktemp -d -t luks_outer_XXXXXX) OUTER_MOUNT_POINT=$(mktemp -d -t luks_outer_XXXXXX)
@@ -98,6 +102,7 @@ handle_nested_partition() {
rmdir "$OUTER_MOUNT_POINT" rmdir "$OUTER_MOUNT_POINT"
exit 1 exit 1
fi fi
fi
local luks_image="$OUTER_MOUNT_POINT/$NESTED_path" local luks_image="$OUTER_MOUNT_POINT/$NESTED_path"
if [ ! -f "$luks_image" ]; then if [ ! -f "$luks_image" ]; then
+8 -6
View File
@@ -2,15 +2,15 @@
set -euo pipefail set -euo pipefail
[[ "$XDG_CURRENT_DESKTOP" != "niri" ]] && exit 1 # [[ "$XDG_CURRENT_DESKTOP" != "niri" ]] && exit 1
# if grep -q 'prefer_order=(nvidia intel)' "$HOME/.local/snippets/set_display"; then # if grep -q 'prefer_order=(nvidia intel)' "$HOME/.local/snippets/set_display"; then
if grep -q '[^[:space:]]' "$HOME/.config/niri/config/prime.kdl"; then if grep -q '[^[:space:]]' "$HOME/.config/niri/config/prime.kdl"; then
# sed -i 's/prefer_order=(nvidia intel)/prefer_order=(intel nvidia)/' "$HOME/.local/snippets/set_display" sed -i -E 's/prefer_order=\([^)]*\)/prefer_order=(intel nvidia)/' "$HOME/.local/snippets/set_display"
echo "" >"$HOME/.config/niri/config/prime.kdl" echo "" >"$HOME/.config/niri/config/prime.kdl"
echo "Disabled global Nvidia Prime offloading." echo "Disabled global Nvidia Prime offloading."
else else
# sed -i 's/prefer_order=(intel nvidia)/prefer_order=(nvidia intel)/' "$HOME/.local/snippets/set_display" sed -i -E 's/prefer_order=\([^)]*\)/prefer_order=(nvidia intel)/' "$HOME/.local/snippets/set_display"
cat >"$HOME/.config/niri/config/prime.kdl" <<EOF cat >"$HOME/.config/niri/config/prime.kdl" <<EOF
environment { environment {
__NV_PRIME_RENDER_OFFLOAD "1" __NV_PRIME_RENDER_OFFLOAD "1"
@@ -23,8 +23,10 @@ fi
# Restart session # Restart session
printf "Session restart is required to apply changes.\nDo it now? (Y/n): " if [[ $XDG_CURRENT_DESKTOP == niri ]]; then
read -r answer printf "Session restart is required to apply changes.\nDo it now? (Y/n): "
if [[ "$answer" =~ ^[Yy]$ || -z "$answer" ]]; then read -r answer
if [[ $answer =~ ^[Yy]$ || -z $answer ]]; then
niri msg action quit niri msg action quit
fi
fi fi
+2 -1
View File
@@ -17,7 +17,8 @@
}, },
"theme": { "theme": {
"dark": { "dark": {
"name": "catppuccin-mocha" "name": "catppuccin-mocha",
"icon_theme": "Papirus"
} }
} }
} }
+1 -1
View File
@@ -14,7 +14,7 @@ prepend_keymap = [
{ on = [ { on = [
"#", "#",
"#", "#",
], run = "plugin yamb jump_by_fzf", desc = "Jump bookmark by fzf" }, ], run = "plugin yamb jump_by_key", desc = "Jump bookmark by key" },
{ on = [ { on = [
"#", "#",
"r", "r",
+2 -2
View File
@@ -1,11 +1,11 @@
[[plugin.deps]] [[plugin.deps]]
use = "yazi-rs/plugins:git" use = "yazi-rs/plugins:git"
rev = "5d5c480" rev = "598cdb6"
hash = "88e56a64b7ce7c4314427452343fef17" hash = "88e56a64b7ce7c4314427452343fef17"
[[plugin.deps]] [[plugin.deps]]
use = "yazi-rs/plugins:smart-enter" use = "yazi-rs/plugins:smart-enter"
rev = "5d5c480" rev = "598cdb6"
hash = "187cc58ba7ac3befd49c342129e6f1b6" hash = "187cc58ba7ac3befd49c342129e6f1b6"
[[plugin.deps]] [[plugin.deps]]
+6 -2
View File
@@ -288,7 +288,6 @@ lib32-vulkan-icd-loader
lib32-vulkan-intel lib32-vulkan-intel
libc++ libc++
libdbusmenu-lxqt libdbusmenu-lxqt
libguestfs
libreoffice-still-zh-cn libreoffice-still-zh-cn
libspng libspng
libva-intel-driver libva-intel-driver
@@ -300,7 +299,7 @@ lightdm
linux-cachyos linux-cachyos
linux-cachyos-headers linux-cachyos-headers
linux-firmware linux-firmware
linuxqq linuxqq-nt
llama.cpp-cuda-git llama.cpp-cuda-git
lldb lldb
llmfit-bin llmfit-bin
@@ -328,6 +327,7 @@ mpv-full
mpv-mpris mpv-mpris
msedit msedit
namcap namcap
nano
nasm nasm
nautilus nautilus
nautilus-share nautilus-share
@@ -340,6 +340,7 @@ niri
nmap nmap
nordvpn-bin nordvpn-bin
noto-fonts-cjk noto-fonts-cjk
ntfsprogs-plus
nvidia-container-toolkit nvidia-container-toolkit
nvidia-open-dkms nvidia-open-dkms
nvidia-prime nvidia-prime
@@ -490,6 +491,7 @@ tmon
tmux tmux
toilet toilet
tombi tombi
tpm2-tools
trash-cli trash-cli
tree tree
ttf-comic-shanns-nerd ttf-comic-shanns-nerd
@@ -498,6 +500,7 @@ ttf-lxgw-wenkai
ttf-lxgw-wenkai-tc ttf-lxgw-wenkai-tc
ttf-maplemono-nf-cn ttf-maplemono-nf-cn
ttf-meslo-nerd ttf-meslo-nerd
ttf-ms-fonts
ttf-noto-sans-cjk-vf ttf-noto-sans-cjk-vf
ttf-symbola ttf-symbola
tty-clock tty-clock
@@ -525,6 +528,7 @@ vulkan-intel
vulkan-mesa-implicit-layers vulkan-mesa-implicit-layers
vulkan-mesa-layers vulkan-mesa-layers
vulkan-swrast vulkan-swrast
vulkan-validation-layers
vvenc vvenc
wallreel wallreel
waydroid waydroid
+18
View File
@@ -0,0 +1,18 @@
走 DMA-BUF 零拷贝导入的消费端 (如 OBS 和浏览器录屏), 其渲染 GPU 必须能导入合成器分配的缓冲区. 最省心的方法是让这些应用和 WM 用同一块 GPU 渲染. 跨 GPU 时可能因为无法导入而捕获失败. 另外, wf-recorder 会根据合成器的渲染设备自动决定分配 buffer 的位置且消费端是编码器而不是某张卡上的渲染上下文所以不受影响.
例如, 如果指定
```kdl
debug {
render-drm-device "/dev/dri/renderD128"
}
```
`renderD128` 表示 Intel 显卡, 那么当设置有
```bash
__NV_PRIME_RENDER_OFFLOAD="1"
__GLX_VENDOR_LIBRARY_NAME="nvidia"
```
环境变量时启动 obs 就会无法捕获屏幕.