diff --git a/config/niri/.config/niri/config/rules.kdl b/config/niri/.config/niri/config/rules.kdl index 9f9c2bb..245c484 100644 --- a/config/niri/.config/niri/config/rules.kdl +++ b/config/niri/.config/niri/config/rules.kdl @@ -54,6 +54,7 @@ window-rule { match app-id="org.gnome.NautilusPreviewer" match app-id="coin" match app-id="wallpaper-carousel" + match app-id="wallreel" match app-id="be.alexandervanhee.gradia" match title="^(图片查看器)(.*)$" // QQ open-floating true diff --git a/config/nwg-look/.config/gtk-3.0/colors.css b/config/nwg-look/.config/gtk-3.0/colors.css index bbdaee7..0762b5a 100644 --- a/config/nwg-look/.config/gtk-3.0/colors.css +++ b/config/nwg-look/.config/gtk-3.0/colors.css @@ -1,4 +1,4 @@ -@define-color borders_breeze #454859; +@define-color borders_breeze #3c3e4e; @define-color content_view_bg_breeze #1e1e2e; @define-color error_color_backdrop_breeze #876790; @define-color error_color_breeze #f38ba8; @@ -7,7 +7,7 @@ @define-color insensitive_base_color_breeze #1e1e2e; @define-color insensitive_base_fg_color_breeze #999fb9; @define-color insensitive_bg_color_breeze #1a1a28; -@define-color insensitive_borders_breeze #393b4c; +@define-color insensitive_borders_breeze #333445; @define-color insensitive_fg_color_breeze #999fb9; @define-color insensitive_selected_bg_color_breeze #1a1a28; @define-color insensitive_selected_fg_color_breeze #999fb9; @@ -74,10 +74,10 @@ @define-color theme_view_active_decoration_color_breeze #313244; @define-color theme_view_hover_decoration_color_breeze #313244; @define-color tooltip_background_breeze #1e1e2e; -@define-color tooltip_border_breeze #4a4c60; +@define-color tooltip_border_breeze #414356; @define-color tooltip_text_breeze #cdd6f4; -@define-color unfocused_borders_breeze #363747; -@define-color unfocused_insensitive_borders_breeze #393b4c; +@define-color unfocused_borders_breeze #323242; +@define-color unfocused_insensitive_borders_breeze #333445; @define-color warning_color_backdrop_breeze #87848f; @define-color warning_color_breeze #f9e2af; @define-color warning_color_insensitive_backdrop_breeze #b7a788; diff --git a/config/nwg-look/.config/gtk-4.0/colors.css b/config/nwg-look/.config/gtk-4.0/colors.css index bbdaee7..0762b5a 100644 --- a/config/nwg-look/.config/gtk-4.0/colors.css +++ b/config/nwg-look/.config/gtk-4.0/colors.css @@ -1,4 +1,4 @@ -@define-color borders_breeze #454859; +@define-color borders_breeze #3c3e4e; @define-color content_view_bg_breeze #1e1e2e; @define-color error_color_backdrop_breeze #876790; @define-color error_color_breeze #f38ba8; @@ -7,7 +7,7 @@ @define-color insensitive_base_color_breeze #1e1e2e; @define-color insensitive_base_fg_color_breeze #999fb9; @define-color insensitive_bg_color_breeze #1a1a28; -@define-color insensitive_borders_breeze #393b4c; +@define-color insensitive_borders_breeze #333445; @define-color insensitive_fg_color_breeze #999fb9; @define-color insensitive_selected_bg_color_breeze #1a1a28; @define-color insensitive_selected_fg_color_breeze #999fb9; @@ -74,10 +74,10 @@ @define-color theme_view_active_decoration_color_breeze #313244; @define-color theme_view_hover_decoration_color_breeze #313244; @define-color tooltip_background_breeze #1e1e2e; -@define-color tooltip_border_breeze #4a4c60; +@define-color tooltip_border_breeze #414356; @define-color tooltip_text_breeze #cdd6f4; -@define-color unfocused_borders_breeze #363747; -@define-color unfocused_insensitive_borders_breeze #393b4c; +@define-color unfocused_borders_breeze #323242; +@define-color unfocused_insensitive_borders_breeze #333445; @define-color warning_color_backdrop_breeze #87848f; @define-color warning_color_breeze #f9e2af; @define-color warning_color_insensitive_backdrop_breeze #b7a788; diff --git a/config/scripts/.local/scripts/fzfclip b/config/scripts/.local/scripts/fzfclip index 6b78480..9334d1b 100755 --- a/config/scripts/.local/scripts/fzfclip +++ b/config/scripts/.local/scripts/fzfclip @@ -105,7 +105,7 @@ _graphics_query() { trap 'stty "$stty_orig"' EXIT 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 support_kgp=0 support_iterm2=0 @@ -139,7 +139,7 @@ _graphics_query() { if [[ "$response" =~ $'\x1b'\[\?([0-9;]*)c ]]; then params="${BASH_REMATCH[1]}" - IFS=';' read -ra codes <<< "$params" + IFS=';' read -ra codes <<<"$params" for code in "${codes[@]}"; do if [[ "$code" == "4" ]]; then @@ -176,9 +176,11 @@ _check_graphics_support() { result=$(_graphics_query) if [[ "$result" == *"kitty"* ]]; then SUPPORT_ICAT=1 - elif [[ "$result" == *"sixels"* ]]; then + fi + if [[ "$result" == *"sixels"* ]]; then SUPPORT_SIXEL=1 - elif [[ "$result" == *"iterm"* ]]; then + fi + if [[ "$result" == *"iterm"* ]]; then SUPPORT_ITERM2=1 fi } @@ -327,7 +329,6 @@ _preview_file() { } export -f _preview_file - preview() { _clear_preview @@ -400,16 +401,16 @@ export -f add_num # Action when confirmed copy_selection() { - local input="$1" + local input="$1" local content content=$(echo -n "$input" | awk "{print \$3}") - if [[ "$content" == "[URL]"* ]]; then + if [[ "$content" == "[URL]"* ]]; then echo -n "$input" | cliphist decode | wl-copy --type text/uri-list - else + else echo -n "$input" | cliphist decode | wl-copy - fi + fi echo -n "$input" | cliphist delete || true } @@ -449,4 +450,4 @@ $RELOAD_CMD | fzf \ --preview-window=down:60%,wrap \ --preview "preview {}" \ --bind "enter:execute-silent(bash -c 'copy_selection \"\$1\"' -- {})+accept" \ ->/dev/null || [ $? -eq 141 ] + >/dev/null || [ $? -eq 141 ] diff --git a/config/yazi/.config/yazi/package.toml b/config/yazi/.config/yazi/package.toml index f131578..513851b 100644 --- a/config/yazi/.config/yazi/package.toml +++ b/config/yazi/.config/yazi/package.toml @@ -1,12 +1,12 @@ [[plugin.deps]] use = "yazi-rs/plugins:git" -rev = "88990a6" +rev = "b224ddf" hash = "270915fa8282a19908449530ff66f7e2" [[plugin.deps]] use = "yazi-rs/plugins:smart-enter" -rev = "88990a6" -hash = "56fdabc96fc1f4d53c96eb884b02a5be" +rev = "b224ddf" +hash = "187cc58ba7ac3befd49c342129e6f1b6" [[plugin.deps]] use = "h-hg/yamb" diff --git a/config/yazi/.config/yazi/plugins/smart-enter.yazi/README.md b/config/yazi/.config/yazi/plugins/smart-enter.yazi/README.md index 742f2e1..9c19bc7 100644 --- a/config/yazi/.config/yazi/plugins/smart-enter.yazi/README.md +++ b/config/yazi/.config/yazi/plugins/smart-enter.yazi/README.md @@ -21,7 +21,7 @@ desc = "Enter the child directory, or open the file" ## Advanced -By default, `--hovered` is passed to the [`open`][open] command, make the behavior consistent with [`enter`][enter] avoiding accidental triggers, +By default, `--hovered` is passed to the [`open`][open] action, make the behavior consistent with [`enter`][enter] avoiding accidental triggers, which means both will only target the currently hovered file. If you still want `open` to target multiple selected files, add this to your `~/.config/yazi/init.lua`: diff --git a/memo/tailscale-nfs.txt b/memo/tailscale-nfs.txt deleted file mode 100644 index 89f9f7e..0000000 --- a/memo/tailscale-nfs.txt +++ /dev/null @@ -1,34 +0,0 @@ -1. tailscale - -Tailscale 基于 WireGuard 实现 NAT 穿透。 - -安装： - 1) General: curl -fsSL https://tailscale.com/install.sh | sh - 2) Archlinux: yay -S tailscale - -安装后： - 1) systemctl 启动 tailscaled 服务； - 2) sudo tailscale up 启动 tailscale； - 3) sudo tailscale status 查看状态 / 网站 https://login.tailscale.com/admin/machines。 - - -2. nfs - -NFS 允许将文件系统挂载到远程主机上。 - -安装： - 1) 服务端: nfs-utils (Archlinux) - 2) 客户端: nfs-common (ubuntu) - -安装后： - 1) 服务端： - a）echo "/path/to/share *(rw,no_subtree_check,async)" | sudo tee -a /etc/exports - 或更精确的权限控制 - b) systemctl 启动 nfs-server 服务 - 2) 客户端 - a) sudo mount -t nfs -o vers=4,noatime,async 100.x.y.z:/path/to/share /path/to/mount - - -3. 解除 - 1) umount即可； - 2) sudo tailscale down 关闭 tailscale。