From 09c5ad7bee9d76534aa90f4131199575871af252 Mon Sep 17 00:00:00 2001 From: SIGKILL64 Date: Mon, 19 Oct 2026 22:46:07 +0800 Subject: [PATCH] 20261019 --- .config/go-musicfox/config.toml | 4 +- .config/htop/htoprc | 8 +- .config/hypr/hyprpaper.conf | 2 +- .config/hypr/land/binds.lua | 12 ++- .config/hypr/land/general.lua | 4 +- .config/hypr/land/plugins.lua | 4 +- .config/hypr/land/rules.lua | 30 +++++-- .config/kitty/theme.conf | 85 +++++++++++++++++++- .config/paru/paru.conf | 44 ++++++++++ .config/waybar/config.hypr.long | 2 +- .config/zsh/zshrc.d/alias.sh | 6 +- .local/bin/aria2wrap | 1 + .local/bin/proton-run | 23 ++++-- .local/share/bubblejail/.gitignore | 1 + .local/share/bubblejail/instances/.gitignore | 1 - 15 files changed, 196 insertions(+), 31 deletions(-) mode change 120000 => 100644 .config/kitty/theme.conf create mode 100644 .config/paru/paru.conf create mode 100644 .local/share/bubblejail/.gitignore delete mode 100644 .local/share/bubblejail/instances/.gitignore diff --git a/.config/go-musicfox/config.toml b/.config/go-musicfox/config.toml index 5b7e737..fe9b064 100755 --- a/.config/go-musicfox/config.toml +++ b/.config/go-musicfox/config.toml @@ -119,14 +119,14 @@ overshoot = 0 # 桌面通知相关设置 [main.notification] # 是否启用桌面通知 -enable = true +enable = false # (Windows/Linux) 默认通知图标 icon = "logo.png" # (Windows/Linux) 是否使用歌曲的专辑封面作为通知图标（如为否则使用默认通知图标） albumCover = true # 是否在 TUI 内显示原生 toast 通知（点赞、下载、订阅、签到等瞬时事件） # 独立于桌面通知开关，可与桌面通知同时启用 -inApp = true +inApp = false # TUI 内 toast 自动消失时长（秒，0 使用默认 4 秒） inAppTimeout = 4 diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 84bddb7..81c2491 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -45,18 +45,18 @@ column_meters_2=CPU(17) CPU(18) CPU(19) CPU(20) CPU(21) CPU(22) CPU(23) CPU(24) column_meter_modes_2=1 1 1 1 1 1 1 1 2 1 tree_view=0 sort_key=46 -tree_sort_key=0 +tree_sort_key=46 sort_direction=-1 -tree_sort_direction=1 +tree_sort_direction=-1 tree_view_always_by_pid=0 all_branches_collapsed=0 screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_PRIV STATE PERCENT_CPU PERCENT_MEM TIME Command .sort_key=PERCENT_CPU -.tree_sort_key=PID +.tree_sort_key=PERCENT_CPU .tree_view_always_by_pid=0 .tree_view=0 .sort_direction=-1 -.tree_sort_direction=1 +.tree_sort_direction=-1 .all_branches_collapsed=0 .stable_tree_view=0 screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index 675d8ca..d30b99a 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,5 +1,5 @@ wallpaper { - monitor = DP-1 + monitor = path = ~/Pictures/.wallpaper fit_mode = fill } diff --git a/.config/hypr/land/binds.lua b/.config/hypr/land/binds.lua index 9ac18b9..03f9ec9 100644 --- a/.config/hypr/land/binds.lua +++ b/.config/hypr/land/binds.lua @@ -24,9 +24,7 @@ hl.bind(main_mod .. ' + K', utils.layout_bind { hl.bind(main_mod .. ' + L', hl.dsp.focus { direction = 'r' }) hl.bind(main_mod .. ' + TAB', hl.dsp.focus { monitor = '+1' }) - -hl.bind(main_mod .. ' + comma', hl.dsp.focus { workspace = 'm-1' }) -hl.bind(main_mod .. ' + period', hl.dsp.focus { workspace = 'm+1' }) +hl.bind('ALT + TAB', hl.dsp.focus { monitor = '+1' }) for i = 1, 9 do hl.bind(main_mod .. ' + CTRL + ' .. i, hl.dsp.dpms { action = 'toggle', monitor = 'DP-' .. i }) -- toggle monitors on/off(not physically, as in idle-screensaver.) @@ -48,7 +46,7 @@ hl.bind(main_mod .. ' + SHIFT + Q', hl.dsp.window.kill()) hl.bind(main_mod .. ' + F', hl.dsp.window.fullscreen { mode = 'maximized', action = 'toggle' }) hl.bind(main_mod .. ' + SHIFT + F', hl.dsp.window.fullscreen { mode = 'fullscreen', action = 'toggle' }) -hl.bind(main_mod .. ' + ALT + P', hl.dsp.window.float { action = 'toggle' }) +hl.bind(main_mod .. ' + SHIFT + P', hl.dsp.window.float { action = 'toggle' }) hl.bind(main_mod .. ' + mouse:272', hl.dsp.window.drag(), { mouse = true }) hl.bind(main_mod .. ' + mouse:273', hl.dsp.window.resize(), { mouse = true }) @@ -60,6 +58,8 @@ hl.bind(main_mod .. ' + SHIFT + K', hl.dsp.window.move { monitor = 'u' }) --hl.bind(main_mod .. ' + SHIFT + L', hl.dsp.window.swap { direction = 'r' }) hl.bind(main_mod .. ' + SHIFT + H', hl.dsp.layout('swapcol l')) hl.bind(main_mod .. ' + SHIFT + L', hl.dsp.layout('swapcol r')) +hl.bind(main_mod .. ' + SHIFT + comma', hl.dsp.window.move { workspace = 'm-1' }) +hl.bind(main_mod .. ' + SHIFT + period', hl.dsp.window.move { workspace = 'm+1' }) hl.bind(main_mod .. ' + S', hl.dsp.window.toggle_swallow()) hl.bind(main_mod .. ' + P', hl.dsp.window.pin { action = 'toggle' }) @@ -73,6 +73,9 @@ end -- -- workspace -- +hl.bind(main_mod .. ' + comma', hl.dsp.focus { workspace = 'm-1' }) +hl.bind(main_mod .. ' + period', hl.dsp.focus { workspace = 'm+1' }) + hl.bind(main_mod .. ' + N', hl.dsp.workspace.toggle_special()) hl.bind(main_mod .. ' + M', hl.dsp.window.move { workspace = 'special' }) @@ -112,6 +115,7 @@ hl.bind(main_mod .. ' + SHIFT + bracketright', hl.dsp.exec_raw('playerctl positi -- screenshot hl.bind('Print', hl.plugin.hyprcapture.open) +hl.bind(main_mod .. ' + S', hl.plugin.hyprcapture.open) -- waybar hl.bind(main_mod .. ' + T', hl.dsp.exec_raw('killall waybar || waybar')) diff --git a/.config/hypr/land/general.lua b/.config/hypr/land/general.lua index 9640c16..2b62e76 100644 --- a/.config/hypr/land/general.lua +++ b/.config/hypr/land/general.lua @@ -114,7 +114,7 @@ hl.config { }, binds = { pass_mouse_when_bound = false, - --allow_workspace_cycles = false, + --allow_workspace_cycles = true, workspace_center_on = 1, -- cursor on workspace(0) or last active window(1) }, render = { @@ -147,6 +147,8 @@ hl.config { close_special_on_empty = true, middle_click_paste = true, + + screencopy_force_8b = false, }, quirks = { prefer_hdr = 1, -- 0 off 1 always 2 gamescope only diff --git a/.config/hypr/land/plugins.lua b/.config/hypr/land/plugins.lua index e7ab7d6..a9851a2 100644 --- a/.config/hypr/land/plugins.lua +++ b/.config/hypr/land/plugins.lua @@ -34,8 +34,8 @@ M.config = { screenshot_mode = 'hdr', -- [sdr]/hdr show_hdr_control = true, -- [true] hdr_save_sdr = false, -- [false] - hdr_drag_format = 'heic', -- [heic]/(png?sdr?) - hdr_clipboard_format = 'heic', -- [heic]/(png?sdr?) + hdr_drag_format = 'sdr', -- [heic]/sdr + hdr_clipboard_format = 'sdr', -- [heic]/sdr filename_template = '%Y%m%d_%H%M%S-{window_class}', -- [Screenshot-%Y-%m-%d-%H%M%S.png] --notification_title_template = '', -- [Screenshot capture], strftime/{mode}/{window_class}{window_title}{filename}{path} --notification_body_template = '', -- [Saved {filename} ({window_title})], same as notification_title_template diff --git a/.config/hypr/land/rules.lua b/.config/hypr/land/rules.lua index f866523..74a6862 100644 --- a/.config/hypr/land/rules.lua +++ b/.config/hypr/land/rules.lua @@ -10,14 +10,23 @@ hl.window_rule { hl.window_rule { name = 'games', - match = { class = '^steam$|^yuanshen.exe$|^steam_app_.*' }, + match = { class = '^steam$|^(?:yuanshen|starrail|zenlesszonezero)\\.exe$|^steam_app_.*' }, workspace = 4, content = 'game', immediate = true, +} +hl.window_rule { + name = 'gamescope', + match = { class = '^gamescope$' }, + + workspace = 4, - --float = true, + content = 'game', + immediate = true, + + float = true, } hl.window_rule { @@ -41,19 +50,28 @@ hl.window_rule { content = 'photo', float = true, + center = true, } hl.window_rule { - name = 'float_only', - match = { class = '^wechat$' }, + name = 'just_float', + match = { class = '^wechat$|^baidunetdisk$' }, float = true, + center = true, } +hl.window_rule { + name = 'just_float_browser', + match = { class = '^app.zen_browser.zen$', title = '^https://translate.google.com' }, + float = true, + center = true, +} hl.window_rule { - name = 'for_floating', - match = { float = true }, + name = 'kitten', + match = { class = '^kitty$', title = '^kitten$' }, + float = true, center = true, } diff --git a/.config/kitty/theme.conf b/.config/kitty/theme.conf deleted file mode 120000 index 5d016fe..0000000 --- a/.config/kitty/theme.conf +++ /dev/null @@ -1 +0,0 @@ -../catppuccin/kitty/themes/macchiato.conf \ No newline at end of file diff --git a/.config/kitty/theme.conf b/.config/kitty/theme.conf new file mode 100644 index 0000000..478cff4 --- /dev/null +++ b/.config/kitty/theme.conf @@ -0,0 +1,84 @@ +# vim:ft=kitty + +## name: Catppuccin Kitty Mocha +## author: Catppuccin Org +## license: MIT +## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf +## blurb: Soothing pastel theme for the high-spirited! + + + +# The basic colors +foreground #cdd6f4 +background #161618 +selection_foreground #1e1e2e +selection_background #f5e0dc + +# Cursor colors +cursor #f5e0dc +cursor_text_color #1e1e2e + +# Scrollbar colors +scrollbar_handle_color #9399b2 +scrollbar_track_color #45475a + +# URL color when hovering with mouse +url_color #f5e0dc + +# Kitty window border colors +active_border_color #b4befe +inactive_border_color #6c7086 +bell_border_color #f9e2af + +# OS Window titlebar colors +wayland_titlebar_color system +macos_titlebar_color system + +# Tab bar colors +active_tab_foreground #11111b +active_tab_background #cba6f7 +inactive_tab_foreground #cdd6f4 +inactive_tab_background #181825 +tab_bar_background #11111b + +# Colors for marks (marked text in the terminal) +mark1_foreground #1e1e2e +mark1_background #b4befe +mark2_foreground #1e1e2e +mark2_background #cba6f7 +mark3_foreground #1e1e2e +mark3_background #74c7ec + +# The 16 terminal colors + +# black +color0 #45475a +color8 #585b70 + +# red +color1 #f38ba8 +color9 #f38ba8 + +# green +color2 #a6e3a1 +color10 #a6e3a1 + +# yellow +color3 #f9e2af +color11 #f9e2af + +# blue +color4 #89b4fa +color12 #89b4fa + +# magenta +color5 #f5c2e7 +color13 #f5c2e7 + +# cyan +color6 #94e2d5 +color14 #94e2d5 + +# white +color7 #bac2de +color15 #a6adc8 diff --git a/.config/paru/paru.conf b/.config/paru/paru.conf new file mode 100644 index 0000000..d75f2ec --- /dev/null +++ b/.config/paru/paru.conf @@ -0,0 +1,44 @@ +# +# $PARU_CONF +# /etc/paru.conf +# ~/.config/paru/paru.conf +# +# See the paru.conf(5) manpage for options + +# +# GENERAL OPTIONS +# +[options] +PgpFetch +Devel +Provides +DevelSuffixes = -git -cvs -svn -bzr -darcs -always -hg -fossil +AurOnly +BottomUp +#RemoveMake +#SudoLoop +#UseAsk +#SaveChanges +#CombinedUpgrade +CleanAfter +#UpgradeMenu +#NewsOnUpgrade + +SortBy = popularity +SearchBy = name-desc +Limit = 20 + +#LocalRepo +#Chroot +#Sign +#SignDb +#KeepRepoCache + +# +# Binary OPTIONS +# +[bin] +FileManager = yazi +Pager = bat -l bash +#MFlags = --skippgpcheck +#Sudo = doas diff --git a/.config/waybar/config.hypr.long b/.config/waybar/config.hypr.long index 649f73b..70911a0 100644 --- a/.config/waybar/config.hypr.long +++ b/.config/waybar/config.hypr.long @@ -81,7 +81,7 @@ "interval": 1, "locale": "C", "format": "{:%R}", - "format-alt": " {:%T}", + "format-alt": " {:%m/%d %R}", //"tooltip-format": " {:%b %d, %a}" "tooltip-format": "{calendar}", "calendar": { diff --git a/.config/zsh/zshrc.d/alias.sh b/.config/zsh/zshrc.d/alias.sh index 39e82c0..00a4c0a 100644 --- a/.config/zsh/zshrc.d/alias.sh +++ b/.config/zsh/zshrc.d/alias.sh @@ -15,7 +15,11 @@ alias rmm='/bin/rm' # utils alias duu='dust -d1' -alias taskfull='taskset 0xffffffff' +alias taskP='taskset 0x000000ff' +alias taskE='taskset 0xffffff00' +alias taskF='taskset 0xffffffff' + +alias bluectl='systemctl start bluetooth.service && bluetoothctl' # kitty alias icat='kitty +kitten icat' diff --git a/.local/bin/aria2wrap b/.local/bin/aria2wrap index 3c81562..236a0a9 100755 --- a/.local/bin/aria2wrap +++ b/.local/bin/aria2wrap @@ -15,6 +15,7 @@ if outdated "${CONF_FILE}"; then mkdir -p "$(dirname "${CONF_FILE}")" bt_trackers="$(curl -s https://cf.trackerslist.com/best_aria2.txt)" cat <"${CONF_FILE}" +dir=$HOME/Downloads/Aria2 continue=true max-concurrent-downloads=8 split=16 diff --git a/.local/bin/proton-run b/.local/bin/proton-run index 23a249c..715d57b 100755 --- a/.local/bin/proton-run +++ b/.local/bin/proton-run @@ -16,7 +16,7 @@ export DXVK_HUD='fps,gpuload,memory,compiler,opacity=0.8' ############## export PROTONPATH="$HOME/.local/data/proton/default" -export PROTON_ENABLE_WAYLAND=1 +#export PROTON_ENABLE_WAYLAND=1 #export PROTON_DXVK_GPLASYNC=1 #export WINEARCH=wow64 @@ -28,9 +28,9 @@ export PROTON_ENABLE_WAYLAND=1 ############# # Gamescope ############# -GAMESCOPE_ARGS='-f -W 2560 -H 1440 -r 180 --framerate-limit 180 -S integer --adaptive-sync' -GAMESCOPE_CLI="gamescope ${GAMESCOPE_ARGS} --" -GAMESCOPE_HDR_CLI="gamescope -O DP-1 --hdr-enabled ${GAMESCOPE_ARGS} --" +GAMESCOPE_ARGS='-r 180 --framerate-limit 180 -S integer --adaptive-sync' +GAMESCOPE_CLI="gamescope -W 2560 -H 1440 ${GAMESCOPE_ARGS} --" +#GAMESCOPE_HDR_CLI="gamescope --hdr-enabled ${GAMESCOPE_ARGS} --" _RUNTIME_DIR="${XDG_RUNTIME_DIR:-/tmp}/games-runtime" mkdir -p "${_RUNTIME_DIR}"; cd "${_RUNTIME_DIR}" @@ -60,10 +60,18 @@ case "$1" in DXVK_HDR=1 PROTON_ENABLE_HDR=1 PROTON_ENABLE_WAYLAND=1 \ exec gamemoderun umu-run 'G:\GenshinImpact\ungi.exe' 90 'G:\GenshinImpact\CN\YuanShen.exe' -popupwindow -window-mode borderless ;; - 'gi') GAMEID=umu-gi exec gamemoderun umu-run 'G:\GenshinImpact\ungi.exe' 90 'G:\GenshinImpact\CN\YuanShen.exe';; + 'gi') + GAMEID=umu-gi exec gamemoderun umu-run 'G:\GenshinImpact\ungi.exe' 90 'G:\GenshinImpact\CN\YuanShen.exe' + ;; #GAMEID=umu-zzz PROTON_DXVK_LLASYNC=1 \ - 'zzz') GAMEID=umu-zzz exec gamemoderun umu-run 'G:\ZenlessZoneZero\CN\ZenlessZoneZero.exe' -use-d3d12;; - 'hsr') GAMEID=umu-hsr PROTON_ENABLE_WAYLAND=1 exec taskset 0xffffff00 umu-run 'G:\HonkaiStarRail\CN\StarRail.exe';; + 'zzz') + GAMEID=umu-zzz exec gamemoderun gamescope -W 1920 -H 1080 -w 1920 -h 1080 ${GAMESCOPE_ARGS} -- \ + umu-run 'G:\ZenlessZoneZero\CN\ZenlessZoneZero.exe' -use-d3d12 + ;; + 'hsr') + unset PROTON_ENABLE_WAYLAND + GAMEID=umu-hsr exec taskset 0xffffff00 umu-run 'G:\HonkaiStarRail\CN\StarRail.exe' + ;; 'wine') shift 2; GAMEID=umu-hoyo exec umu-run "$@";; esac ;; @@ -78,6 +86,7 @@ case "$1" in export WINEPREFIX="$HOME/.local/data/wineprefix/Cracks" case "$2" in 'tf3') GAMEID=umu-tf3 exec gamemoderun umu-run 'G:\TransportFever3\TransportFever3.exe';; + 'factorio') GAMEID=umu-factorio exec gamemoderun umu-run 'G:\Factorio\bin\x64\factorio.exe';; 'afterinc') GAMEID=umu-afterinc exec gamemoderun umu-run 'G:\AfterIncRevival\After Inc. Revival.exe';; 'cities2') GAMEID=umu-cities exec gamemoderun umu-run 'G:\CitiesSkylinesII\Cities2.exe';; 'palworld') GAMEID=umu-palworld exec gamemoderun umu-run 'G:\Palworld\Palworld.exe';; diff --git a/.local/share/bubblejail/.gitignore b/.local/share/bubblejail/.gitignore new file mode 100644 index 0000000..7c14150 --- /dev/null +++ b/.local/share/bubblejail/.gitignore @@ -0,0 +1 @@ +instances/*/home/ diff --git a/.local/share/bubblejail/instances/.gitignore b/.local/share/bubblejail/instances/.gitignore deleted file mode 100644 index db2244f..0000000 --- a/.local/share/bubblejail/instances/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*/home/