diff options
| author | littleblack111 <littleblack11111@gmail.com> | 2026-09-12 14:29:30 +0800 |
|---|---|---|
| committer | littleblack111 <littleblack11111@gmail.com> | 2026-09-12 14:29:30 +0800 |
| commit | 1c1f7605246a1a9cbe9248224c8862be2b360107 (patch) | |
| tree | eb5e4afade113abbb0870d781db84c153a03fa61 | |
| parent | 4dba3e0ea44a2251afb7661252323b256936611d (diff) | |
bump
38 files changed, 370 insertions, 88 deletions
diff --git a/boot/loader/entries/arch-zen.conf b/boot/loader/entries/arch-zen.conf new file mode 100755 index 00000000..12b03615 --- /dev/null +++ b/boot/loader/entries/arch-zen.conf @@ -0,0 +1,4 @@ +title Arch Linux +linux /vmlinuz-linux-zen +initrd /initramfs-linux-zen.img +options apparmor=1 lsm=landlock,lockdown,yama,integrity,apparmor,selinux,bpf intel_iommu=on iommu=pt ibt=off nvidia-drm.modeset=1 nvidia_drm.fbdev=1 NVreg_PreserveVideoMemoryAllocations=1 systemd.show_status=auto loglevel=3 udev.log-priority=3 udev.log_level=3 vt.global_cursor_default=0 rd.luks.uuid=8d8ffbd2-5876-481b-b7e7-8ce2fb5346eb rd.luks.options=8d8ffbd2-5876-481b-b7e7-8ce2fb5346eb=tpm2-device=auto,discard root=/dev/mapper/arch-root rw rootflags=rw,relatime,ssd,discard=async,space_cache=v2,subvol=@ resume=/dev/mapper/arch-swap quiet loglevel=3 mitigations=off splash diff --git a/boot/loader/entries/arch.conf b/boot/loader/entries/arch.conf new file mode 100755 index 00000000..d86e72b8 --- /dev/null +++ b/boot/loader/entries/arch.conf @@ -0,0 +1,4 @@ +title Arch Linux +linux /vmlinuz-linux +initrd /initramfs-linux.img +options apparmor=1 lsm=landlock,lockdown,yama,integrity,apparmor,selinux,bpf intel_iommu=on iommu=pt ibt=off nvidia-drm.modeset=1 nvidia_drm.fbdev=1 NVreg_PreserveVideoMemoryAllocations=1 systemd.show_status=auto loglevel=3 udev.log-priority=3 udev.log_level=3 vt.global_cursor_default=0 rd.luks.uuid=8d8ffbd2-5876-481b-b7e7-8ce2fb5346eb rd.luks.options=8d8ffbd2-5876-481b-b7e7-8ce2fb5346eb=tpm2-device=auto,discard root=/dev/mapper/arch-root rw rootflags=rw,relatime,ssd,discard=async,space_cache=v2,subvol=@ resume=/dev/mapper/arch-swap quiet loglevel=3 mitigations=off splash diff --git a/dot-config/Deskflow/Deskflow.conf b/dot-config/Deskflow/Deskflow.conf index 2540dbd1..84bbd531 100644 --- a/dot-config/Deskflow/Deskflow.conf +++ b/dot-config/Deskflow/Deskflow.conf @@ -29,7 +29,7 @@ clipboardSharingSize=@Variant(\0\0\0\x84\0\0\0\0\0\xf\xa0\0) defaultLockToScreenState=false disableLockToScreen=false hasHeartbeat=false -hasSwitchDelay=false +hasSwitchDelay=true hasSwitchDoubleTap=false heartbeat=5000 hotkeys\size=0 diff --git a/dot-config/Deskflow/deskflow-server.conf b/dot-config/Deskflow/deskflow-server.conf index 15c10e98..8e1c509c 100644 --- a/dot-config/Deskflow/deskflow-server.conf +++ b/dot-config/Deskflow/deskflow-server.conf @@ -1,2 +1,40 @@ -[core] -computerName=arch +section: screens + MacBook-Pro.local: + halfDuplexCapsLock = false + halfDuplexNumLock = false + halfDuplexScrollLock = false + xtestIsXineramaUnaware = false + switchCorners = none + switchCornerSize = 0 + arch: + halfDuplexCapsLock = false + halfDuplexNumLock = false + halfDuplexScrollLock = false + xtestIsXineramaUnaware = false + switchCorners = none + switchCornerSize = 0 +end + +section: aliases +end + +section: links + MacBook-Pro.local: + right = arch + arch: + left = MacBook-Pro.local +end + +section: options + protocol = barrier + relativeMouseMoves = false + win32KeepForeground = false + defaultLockToScreenState = false + disableLockToScreen = false + clipboardSharing = true + clipboardSharingSize = 1024000 + switchDelay = 250 + switchCorners = none + switchCornerSize = 0 +end + diff --git a/dot-config/Thunar/accels.scm b/dot-config/Thunar/accels.scm index 6da979fa..7f0f9ba1 100755 --- a/dot-config/Thunar/accels.scm +++ b/dot-config/Thunar/accels.scm @@ -22,7 +22,6 @@ ; (gtk_accel_path "<Actions>/ThunarActionManager/open" "<Primary>o") ; (gtk_accel_path "<Actions>/ThunarStandardView/sort-ascending" "") ; (gtk_accel_path "<Actions>/ThunarWindow/toggle-split-view" "F3") -; (gtk_accel_path "<Actions>/ThunarBookmarks/58aee9cdc08cc0d34d7849ae75316a63" "") ; (gtk_accel_path "<Actions>/ThunarActionManager/copy-2" "<Primary>Insert") ; (gtk_accel_path "<Actions>/ThunarActionManager/trash-delete" "Delete") ; (gtk_accel_path "<Actions>/ThunarWindow/open-recent" "") @@ -122,6 +121,7 @@ ; (gtk_accel_path "<Actions>/ThunarWindow/empty-trash" "") ; (gtk_accel_path "<Actions>/ThunarBookmarks/5c1b3e9a85ac77fb8262ac48ee3ca8ab" "") ; (gtk_accel_path "<Actions>/ThunarWindow/preferences" "") +; (gtk_accel_path "<Actions>/ThunarBookmarks/f82b2f86f67bddb2d5432d8ff754e9b4" "") ; (gtk_accel_path "<Actions>/ThunarActionManager/delete" "") ; (gtk_accel_path "<Actions>/ThunarWindow/open-network" "") ; (gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-tree" "<Primary>e") diff --git a/dot-config/btop/btop.conf b/dot-config/btop/btop.conf index 674286e2..e08ac3d0 100644 --- a/dot-config/btop/btop.conf +++ b/dot-config/btop/btop.conf @@ -68,7 +68,7 @@ update_ms = 1400 #* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct", #* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly. -proc_sorting = "memory" +proc_sorting = "cpu direct" #* Reverse sorting order, True or False. proc_reversed = false @@ -228,10 +228,10 @@ net_download = 100 net_upload = 100 #* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest. -net_auto = true +net_auto = false #* Sync the auto scaling for download and upload to whichever currently has the highest scale. -net_sync = false +net_sync = true #* Starts with the Network Interface specified here. net_iface = "" diff --git a/dot-config/dconf/user b/dot-config/dconf/user Binary files differindex af5787f5..09dfd1d6 100644 --- a/dot-config/dconf/user +++ b/dot-config/dconf/user diff --git a/dot-config/fcitx5/conf/notifications.conf b/dot-config/fcitx5/conf/notifications.conf index 6e7d1b9d..719897e4 100644 --- a/dot-config/fcitx5/conf/notifications.conf +++ b/dot-config/fcitx5/conf/notifications.conf @@ -1,3 +1,3 @@ # Hidden Notifications -HiddenNotifications= +# HiddenNotifications= diff --git a/dot-config/fcitx5/conf/notifications.conf_rLwHyB b/dot-config/fcitx5/conf/notifications.conf_rLwHyB new file mode 100644 index 00000000..6e7d1b9d --- /dev/null +++ b/dot-config/fcitx5/conf/notifications.conf_rLwHyB @@ -0,0 +1,3 @@ +# Hidden Notifications +HiddenNotifications= + diff --git a/dot-config/fcitx5/conf/pinyin.conf b/dot-config/fcitx5/conf/pinyin.conf index 9261bcce..ed575842 100644 --- a/dot-config/fcitx5/conf/pinyin.conf +++ b/dot-config/fcitx5/conf/pinyin.conf @@ -48,6 +48,8 @@ NextCandidate= UseKeypadAsSelection=False # Choose Character from Phrase ChooseCharFromPhrase= +# Choose Last Character from Phrase +ChooseLastCharFromPhrase=bracketright # Use BackSpace to cancel the selection BackSpaceToUnselect=True # Filter by stroke @@ -105,6 +107,8 @@ FirstRun=False VE_UE=True # Common Typo NG_GN=True +# Match Letter in lower case +LowerCaseMatchLetter=True # Inner Segment (xian -> xi'an) Inner=True # Inner Segment for Short Pinyin (qie -> qi'e) diff --git a/dot-config/fcitx5/conf/rime.conf b/dot-config/fcitx5/conf/rime.conf index 831f5967..734c16d7 100644 --- a/dot-config/fcitx5/conf/rime.conf +++ b/dot-config/fcitx5/conf/rime.conf @@ -4,7 +4,10 @@ PreeditMode="Composing text" InputState=All # Fix embedded preedit cursor at the beginning of the preedit PreeditCursorPositionAtBeginning=True -# Commit current text when deactivating -Commit when deactivate=True -PreeditInApplication=True +# Action when switching input method +SwitchInputMethodBehavior="Commit raw input" +# Deploy +Deploy= +# Synchronize +Synchronize= diff --git a/dot-config/fcitx5/config b/dot-config/fcitx5/config index c2cdfaa0..9265036c 100644 --- a/dot-config/fcitx5/config +++ b/dot-config/fcitx5/config @@ -42,7 +42,7 @@ ModifierOnlyKeyTimeout=250 0=Control+Alt+P [Behavior] -# Active By Default +# Activate input method by default ActiveByDefault=False # Reset state on Focus In resetStateWhenFocusIn=No @@ -58,7 +58,7 @@ showInputMethodInformationWhenFocusIn=False CompactInputMethodInformation=True # Show first input method information ShowFirstInputMethodInformation=True -# Default page size +# Default Candidates per page DefaultPageSize=10 # Override XKB Option OverrideXkbOption=False diff --git a/dot-config/fcitx5/profile b/dot-config/fcitx5/profile index 515db798..5163a512 100644 --- a/dot-config/fcitx5/profile +++ b/dot-config/fcitx5/profile @@ -10,19 +10,13 @@ DefaultIM=rime # Name Name=keyboard-us # Layout -Layout= +# Layout= [Groups/0/Items/1] # Name -Name=pinyin -# Layout -Layout= - -[Groups/0/Items/2] -# Name Name=rime # Layout -Layout= +# Layout= [GroupOrder] 0=Default diff --git a/dot-config/fcitx5/profile_fuZ7me b/dot-config/fcitx5/profile_fuZ7me new file mode 100644 index 00000000..515db798 --- /dev/null +++ b/dot-config/fcitx5/profile_fuZ7me @@ -0,0 +1,29 @@ +[Groups/0] +# Group Name +Name=Default +# Layout +Default Layout=us +# Default Input Method +DefaultIM=rime + +[Groups/0/Items/0] +# Name +Name=keyboard-us +# Layout +Layout= + +[Groups/0/Items/1] +# Name +Name=pinyin +# Layout +Layout= + +[Groups/0/Items/2] +# Name +Name=rime +# Layout +Layout= + +[GroupOrder] +0=Default + diff --git a/dot-config/fish/conf.d/abbr.fish b/dot-config/fish/conf.d/abbr.fish index 42cf8046..9567bc5b 100644 --- a/dot-config/fish/conf.d/abbr.fish +++ b/dot-config/fish/conf.d/abbr.fish @@ -179,7 +179,7 @@ abbr -a powertop "sudo powertop" abbr -a upgrade-grub "grub-mkconfig -o /boot/grub/grub.cfg" #alias update-grub='sudo update-grub' abbr -a grub-mkconfig "sudo grub-mkconfig" -abbr -a update-initramfs "mkinitcpio -P" +alias update-initramfs="mkinitcpio -P" abbr -a kgupdate "update-initramfs && grub-mkconfig -o /boot/grub/grub.cfg" abbr -a locale-gen "sudo locale-gen" abbr -a ufw "sudo ufw" @@ -348,6 +348,7 @@ function mkcd end abbr -a cloc tokei +alias cloc tokei abbr -a strace lurk abbr -a fd "fd -HI" alias ssh "kitty +kitten ssh" diff --git a/dot-config/fish/conf.d/git.abbr.fish b/dot-config/fish/conf.d/git.abbr.fish index 5c7784be..2ff70269 100644 --- a/dot-config/fish/conf.d/git.abbr.fish +++ b/dot-config/fish/conf.d/git.abbr.fish @@ -113,7 +113,18 @@ end # alias gcsm='git commit -s -m' # alias gcss='git commit -S -s' # alias gcssm='git commit -S -s -m' -abbr -a gd "git diff" +# abbr -a gd "git diff" +function gd + if test (count $argv) -eq 1 + if test -e $argv[1] + git diff $argv + else + git diff $argv[1]~1 $argv[1] + end + else + git diff $argv + end +end # alias gdca='git diff --cached' # alias gdct='git describe --tags $(git rev-list --tags --max-count=1)' # alias gdcw='git diff --cached --word-diff' diff --git a/dot-config/gtk-3.0/bookmarks b/dot-config/gtk-3.0/bookmarks index 304a906f..36f7aee1 100644 --- a/dot-config/gtk-3.0/bookmarks +++ b/dot-config/gtk-3.0/bookmarks @@ -2,7 +2,7 @@ file:///home/system/Documents file:///home/system/Videos file:///home/system/Music file:///home/system/Pictures -file:///home/system/Pictures/Screenshots +file:///mnt/DATA/personal/Nextcloud/Pictures/Screenshots file:///home/system/Nextcloud file:///home/system/Nextcloud/iCloud file:///home/system/Downloads diff --git a/dot-config/hypr/autostart.lua b/dot-config/hypr/autostart.lua index 6be0cca8..526d5946 100644 --- a/dot-config/hypr/autostart.lua +++ b/dot-config/hypr/autostart.lua @@ -18,7 +18,7 @@ hl.on("hyprland.start", function() -- Waybar -- hl.exec_cmd('waybar') -- Quickshell - hl.exec_cmd('qs -d') + hl.exec_cmd('just -f ~/.config/quickshell/qml_plugin/justfile run release') -- Hypr-Eco -- hl.exec_cmd('hyprpaper') -- hl.exec_cmd($'SCRIPTSDIR/hyprpaper.sh') @@ -49,7 +49,7 @@ hl.on("hyprland.start", function() hl.exec_cmd('wl-paste --type text --watch cliphist store') hl.exec_cmd('wl-paste --type image --watch cliphist store') -- hl.exec_cmd('clipsync') - -- hl.exec_cmd('wl-clip-persist --clipboard regular') + hl.exec_cmd('wl-clip-persist --clipboard both') -- Notification agent hl.exec_cmd('while true; do swaync; done') diff --git a/dot-config/hypr/binds.lua b/dot-config/hypr/binds.lua index 6c08a215..77f48d35 100644 --- a/dot-config/hypr/binds.lua +++ b/dot-config/hypr/binds.lua @@ -37,7 +37,7 @@ hl.bind(mod .. " + SHIFT + F", hl.dsp.exec_cmd(vars.fileManager)) -- bind = mod shift, w, execr, $browser --restore-last-session hl.bind(mod .. " + SHIFT + W", hl.dsp.exec_cmd(vars.browser .. " -new-tab about:sessionrestore")) hl.bind(mod .. " + SHIFT + E", hl.dsp.exec_cmd("zeditor")) -hl.bind(mod .. " + SHIFT + D", hl.dsp.exec_cmd("discord " .. vars.waylandarg)) +hl.bind(mod .. " + SHIFT + D", hl.dsp.exec_cmd("vesktop " .. vars.waylandarg)) hl.bind(mod .. " + SHIFT + B", hl.dsp.exec_cmd("beeper " .. vars.waylandarg)) -- CLI hl.bind("CTRL + ALT + A", hl.dsp.exec_cmd(vars.termfloat .. " --title=pulsemixer -e pulsemixer")) @@ -226,14 +226,16 @@ local autoclickers = { { bind = "mouse:275", name = "right", args = " right" } } -for _, ac in ipairs(autoclickers) do - hl.bind(ac.bind, - hl.dsp.exec_cmd("exec -a autoclicker-" .. - ac.name .. " zsh -c 'while true; do wlrctl pointer click" .. ac.args .. "; sleep $((0.$RANDOM/10)); done'"), - { ignore_mods = true }) - hl.bind(ac.bind, hl.dsp.exec_cmd("kill $(pgrep -f autoclicker-" .. ac.name .. ")"), - { ignore_mods = true, release = true }) -end +-- for _, ac in ipairs(autoclickers) do +-- hl.bind(ac.bind, +-- hl.dsp.exec_cmd("exec -a autoclicker-" .. +-- ac.name .. " zsh -c 'while true; do wlrctl pointer click" .. ac.args .. "; sleep $((0.$RANDOM/10)); done'"), +-- { ignore_mods = true }) +-- hl.bind(ac.bind, hl.dsp.exec_cmd("kill $(pgrep -f autoclicker-" .. ac.name .. ")"), +-- { ignore_mods = true, release = true }) +-- -- hl.bind(ac.bind, hl.dsp.exec_cmd("notify-send a"), +-- -- { release = true }) +-- end hl.bind(mod .. " + SHIFT + Escape", hl.dsp.release_input_capture(), { allow_input_capture = true }) hl.bind(mod .. " + CTRL + SHIFT + Escape", hl.dsp.exec_cmd("killall deskflow-core; deskflow-core server -s ~/.config/Deskflow/deskflow-server.conf"), { allow_input_capture = true }) diff --git a/dot-config/hypr/decor.lua b/dot-config/hypr/decor.lua index d773d75d..b2dd35dc 100644 --- a/dot-config/hypr/decor.lua +++ b/dot-config/hypr/decor.lua @@ -31,7 +31,7 @@ hl.config({ -- color = rgba(1a1a1aee), }, - screen_shader = "/usr/share/hyprshade/shaders/vibrance.glsl", + -- screen_shader = "/usr/share/hyprshade/shaders/vibrance.glsl", blur = { enabled = true, diff --git a/dot-config/hypr/rules.lua b/dot-config/hypr/rules.lua index 16d7cf89..abe9c422 100644 --- a/dot-config/hypr/rules.lua +++ b/dot-config/hypr/rules.lua @@ -125,7 +125,7 @@ hl.window_rule({ match = { tag = "games" }, suppress_event = "activatefocus" }) -- time-sensitive app rules hl.window_rule({ match = { tag = "time-sensitive" }, - stay_focused = true, + -- stay_focused = true, pin = true, dim_around = true, center = true, @@ -156,10 +156,10 @@ local app_tags = { { class = "^(Alacritty|Xfce4-terminal|Kitty|" .. (vars.term or "$term") .. "|com.mitchellh.ghostty)$", tag = "+terminal" }, { class = "^(" .. (vars.browser or "$browser") .. "|Brave-browser|chromium|firefox|thorium|zen)$", tag = "+web" }, { class = "^(" .. (vars.fileManager or "$fileManager") .. "|Pcmanfm|thunar|org.qbittorrent.qBittorrent|Caja)$", tag = "+file" }, - { class = "^(code|code-url-handler|cursor-url-handler|code-oss|Code - OSS|install4j-burp-StartBurp|burp-StartBurp|Unity|jetbrains-pycharm-ce|Postman|jetbrains-clion|.*\\.zed\\.Zed-.*)$", tag = "+code" }, + { class = "^(code|code-url-handler|cursor-url-handler|code-oss|Code - OSS|install4j-burp-StartBurp|burp-StartBurp|Unity|jetbrains-pycharm-ce|Postman|jetbrains-clion|.*\\.zed\\.Zed-.*|dev.zed.Zed-Preview)$", tag = "+code" }, { class = "^(LibreOffice.*|libreoffice.*|Typora|obsidian|figma-linux|anytype|craft-nativefier-e0958b|evince|org.gnome.Evince|ClickUp)$", tag = "+office" }, { class = "^(discord|vesktop|VencordDesktop|Chat-gpt|Whatsapp-for-linux|Chatbox)$", tag = "+communication" }, - { class = "^(Audacity|Music|MPlayer|Lxmusic|Inkscape|Gimp|Blender|obs|zoom|Zoom|Pitivi|kdenlive|openshot|vlc|cider|Cider|shotwell|Shotwell|fr.handbrake.ghb|spotify|spotify)$", tag = "+media" }, + { class = "^(Audacity|Music|MPlayer|Lxmusic|Inkscape|Gimp|Blender|obs|zoom|Zoom|Pitivi|kdenlive|openshot|vlc|cider|Cider|shotwell|Shotwell|fr.handbrake.ghb|spotify|Spotify)$", tag = "+media" }, { class = "^(Minecraft|Badlion|War|steam_proton|steam|csgo_linux64|cs2|minecraft-launcher|lutris|genshinimpact\\.exe|moe\\.launcher\\.an-anime-game-launcher|lunarclient|Lunar Client.*|zenlesszonezero\\.exe|moe\\.launcher\\.sleepy-launcher|org\\.vinegarhq\\.Sober|War Thunder.*|steam_app_.*)$", tag = "+games" }, { class = "^(virt-manager|blueman-adapters|blueman-manager|GParted|Xdm-app|timeshift-gtk|com\\.nextcloud\\.desktopclient\\.nextcloud|gearlever|Lxappearance|Lxtask|Lxrandr|Arandr|System-config-printer\\.py|Pavucontrol|Exo-helper-1|Protonvpn|Xfce4-power-manager-settings|Mysql-workbench-bin|Grub-customizer|Nitrogen|archlinux-tweak-tool\\.py|pamac-manager|helvum|Vmware|btrfs-assistant|Bitwarden|wootility-lekker|nwg-look|com\\.github\\.wwmm\\.easyeffects|kvantummanager)$", tag = "+system" }, { class = "^(os_server|Os_server)$", tag = "+misc" }, @@ -233,7 +233,7 @@ local opacity_rules = { { class = "^Caja$", active = "0.90", inactive = "0.80" }, { class = "^polkit-gnome-authentication-agent-1$", active = "0.80", inactive = "0.70" }, { title = "^Open$", active = "0.80", inactive = "0.70" }, - { title = "^New Tab - Thorium$", active = "0.8", inactive = "0.5" } + { class = "^obsidian$", active = "0.99", inactive = "0.99" }, } for _, rule in ipairs(opacity_rules) do @@ -258,12 +258,12 @@ hl.window_rule({ match = { title = "^(Annotation - Zoom)$" }, no_blur = true }) local layer_rules = { { namespace = ".*", blur_popups = true }, { namespace = "^rofi$", blur = true, ignore_alpha = 0, dim_around = true, animation = "popin 45%" }, - { namespace = "^quickshell::launcher.*$", blur = true, ignore_alpha = 0, dim_around = true, animation = "popin 45%" }, { namespace = "^notifications$", blur = true, ignore_alpha = 0 }, { namespace = "^swaync-notification-window$", blur = true, ignore_alpha = 0, animation = "slide right" }, { namespace = "^swaync-control-center$", blur = true, ignore_alpha = 0, animation = "slide right" }, { namespace = "^logout_dialog$", blur = true }, { namespace = "^waybar$", blur = true, ignore_alpha = 0 }, + { namespace = "^quickshell::launcher.*$", blur = true, ignore_alpha = 0, dim_around = true, animation = "popin 45%" }, { namespace = "^quickshell::bar$", blur = true, ignore_alpha = 0 }, { namespace = "^quickshell::CC$", blur = true, ignore_alpha = 0, dim_around = true }, { namespace = "^syshud$", blur = true, ignore_alpha = 0 }, diff --git a/dot-config/rustfmt/rustfmt.toml b/dot-config/rustfmt/rustfmt.toml index 048ca096..04ff5de6 100644 --- a/dot-config/rustfmt/rustfmt.toml +++ b/dot-config/rustfmt/rustfmt.toml @@ -1,13 +1,13 @@ # max_width = 104400000000 use_small_heuristics = "Max" -chain_width = 0 +# chain_width = 0 fn_call_width = 0 attr_fn_like_width = 0 -array_width = 0 +# array_width = 0 struct_lit_width = 0 struct_variant_width = 0 -single_line_if_else_max_width = 0 +# single_line_if_else_max_width = 0 wrap_comments = true format_code_in_doc_comments = true diff --git a/dot-config/spicetify/config-xpui.ini b/dot-config/spicetify/config-xpui.ini index 2249d5d8..85263789 100644 --- a/dot-config/spicetify/config-xpui.ini +++ b/dot-config/spicetify/config-xpui.ini @@ -28,5 +28,5 @@ expose_apis = 1 ; DO NOT CHANGE! [Backup] -version = 1.2.92.147.g5b8f9367 +version = 1.2.96.518.g366879e1 with = 2.44.0 diff --git a/dot-config/wallust/templates/obsidian.css b/dot-config/wallust/templates/obsidian.css new file mode 100644 index 00000000..a6d76ec3 --- /dev/null +++ b/dot-config/wallust/templates/obsidian.css @@ -0,0 +1,27 @@ +.theme-dark, +.theme-light { + /* Background Depths */ + /* --background-primary: {{background}} !important; + --background-secondary: {{color0}} !important; + --background-secondary-alt: {{color0}} !important; + --background-modifier-border: {{color8}} !important; + --background-modifier-form-field: {{color0}} !important; */ + + /* Text Contrast Scale */ + --text-faint: {{color8}} !important; + --text-muted: {{color7}} !important; + --text-normal: {{foreground}} !important; + --text-on-accent: {{background}} !important; + + /* Accents & Interactive (Using $cursor as primary override) */ + --color-accent: {{cursor}} !important; + --color-accent-1: {{color9}} !important; + --color-accent-2: {{color1}} !important; + --interactive-accent: {{cursor}} !important; + --interactive-accent-hover: {{color11}} !important; + + /* Selections & Highlights */ + --text-selection: {{color8}}80 !important; + --fl-bg-color: {{color0}}80 !important; +} + diff --git a/dot-config/wallust/wallust.toml b/dot-config/wallust/wallust.toml index 9a994a76..fd5411c4 100644 --- a/dot-config/wallust/wallust.toml +++ b/dot-config/wallust/wallust.toml @@ -82,3 +82,6 @@ fcitx5highlight.target = "~/.local/share/fcitx5/themes/wallust/highlight.svg" fcitx5panel.template = "fcitx5panel.svg" fcitx5panel.target = "~/.local/share/fcitx5/themes/wallust/panel.svg" + +obsidian.template = "obsidian.css" +obsidian.target = "~/Documents/Obsidian Vault/.obsidian/snippets/wallust.css" diff --git a/dot-config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/dot-config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml index d928ed33..0bfef9fd 100644 --- a/dot-config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml +++ b/dot-config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml @@ -13,7 +13,7 @@ <property name="last-sort-order" type="string" value="GTK_SORT_DESCENDING"/> <property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_38_PERCENT"/> <property name="last-details-view-visible-columns" type="string" value="THUNAR_COLUMN_DATE_MODIFIED,THUNAR_COLUMN_NAME,THUNAR_COLUMN_SIZE,THUNAR_COLUMN_TYPE"/> - <property name="last-details-view-column-widths" type="string" value="50,50,138,130,50,117,50,50,653,50,50,86,50,92"/> + <property name="last-details-view-column-widths" type="string" value="50,50,138,130,98,103,50,50,704,50,50,89,50,158"/> <property name="misc-status-bar-active-info" type="uint" value="31"/> <property name="misc-text-beside-icons" type="bool" value="false"/> <property name="misc-folders-first" type="bool" value="false"/> @@ -23,4 +23,6 @@ <property name="last-restore-tabs" type="bool" value="false"/> <property name="misc-full-path-in-tab-title" type="bool" value="true"/> <property name="last-menubar-visible" type="bool" value="true"/> + <property name="misc-expandable-folders" type="bool" value="false"/> + <property name="last-side-pane" type="string" value="THUNAR_SIDEPANE_TYPE_SHORTCUTS"/> </channel> diff --git a/dot-config/zed/keymap.json b/dot-config/zed/keymap.json index d84fcae1..f9b1b766 100644 --- a/dot-config/zed/keymap.json +++ b/dot-config/zed/keymap.json @@ -595,12 +595,6 @@ { "context": "(Editor && showing_completions)", "bindings": { - "ctrl-y": "editor::ConfirmCompletion", - }, - }, - { - "context": "(Editor && showing_completions)", - "bindings": { "enter": "editor::Newline", }, }, @@ -619,12 +613,6 @@ { "context": "Picker > Editor", "bindings": { - "ctrl-y": "picker::ConfirmCompletion", - }, - }, - { - "context": "Picker > Editor", - "bindings": { "tab": null, }, }, @@ -813,12 +801,6 @@ }, }, { - "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", - "bindings": { - "space g b": "editor::ToggleGitBlameInline", - }, - }, - { "context": "!ContextEditor > (Editor && (vim_mode == helix_normal || vim_mode == helix_select))", "bindings": { "shift-i": "assistant::InlineAssist", @@ -968,4 +950,76 @@ "ctrl-f": "search::FocusSearch", }, }, + { + "context": "Pane", + "bindings": { + "ctrl-w": "pane::CloseActiveItem" + } + }, + { + "context": "ProjectPanel", + "bindings": { + "ctrl-shift-v": "project_panel::Paste" + } + }, + { + "context": "ProjectPanel", + "unbind": { + "ctrl-v": "project_panel::Paste" + } + }, + { + "context": "Editor", + "bindings": { + "ctrl-shift-v": "editor::Paste" + } + }, + { + "context": "Editor", + "unbind": { + "ctrl-v": "editor::Paste" + } + }, + { + "context": "(vim_mode == helix_normal || vim_mode == helix_select) && !menu", + "bindings": { + "space g b": "git::Blame" + } + }, + { + "context": "Editor", + "unbind": { + "alt-g b": "git::Blame" + } + }, + { + "context": "Editor && showing_completions", + "bindings": { + "ctrl-y": "editor::ConfirmCompletionInsert" + } + }, + { + "context": "Editor && showing_completions", + "unbind": { + "tab": "editor::ComposeCompletion" + } + }, + { + "context": "Picker > Editor", + "bindings": { + "ctrl-y": "picker::ConfirmCompletion" + } + }, + { + "context": "Picker > Editor", + "unbind": { + "tab": "picker::ConfirmCompletion" + } + }, + { + "context": "!Terminal", + "unbind": { + "ctrl-shift-c": "collab_panel::ToggleFocus" + } + } ] diff --git a/dot-config/zed/settings.json b/dot-config/zed/settings.json index 7ffc7f31..12f05a98 100644 --- a/dot-config/zed/settings.json +++ b/dot-config/zed/settings.json @@ -7,12 +7,14 @@ // custom settings, run `zed: open default settings` from the // command palette (cmd-shift-p / ctrl-shift-p) { + "format_on_save": "on", + "languages": {}, "agent_servers": { - "opencode": { - "type": "registry" - } - }, - "cli_default_open_behavior": "new_window", + "opencode": { + "type": "registry", + }, + }, + "cli_default_open_behavior": "new_window", "outline_panel": { "dock": "left", }, @@ -24,7 +26,8 @@ }, "colorize_brackets": true, "collaboration_panel": { - "dock": "left", + "button": false, + "dock": "left", }, "diagnostics": { "inline": { @@ -48,6 +51,10 @@ "use_system_clipboard": "on_yank", }, "edit_predictions": { + "codestral": { + "model": "codestral-latest", + "api_url": "https://codestral.mistral.ai", + }, "allow_data_collection": "no", "provider": "copilot", "disabled_globs": [], @@ -134,7 +141,7 @@ "node": { "npm_path": "bun", }, - "base_keymap": "VSCode", + "base_keymap": "Zed", "status_bar": { "experimental.show": true, }, @@ -149,4 +156,21 @@ "ui_font_size": 18.0, "buffer_font_size": 15.0, "theme": "wal", + "completions": { + "lsp_insert_mode": "insert", + }, + "lsp": { + "rust-analyzer": { + "initialization_options": { + "check": { + "command": "clippy", + }, + }, + }, + "qmljs": { + "binary": { + "path": "/usr/bin/qmlls", + }, + }, + }, } diff --git a/dot-config/zed/settings_backup.json b/dot-config/zed/settings_backup.json index b6c16637..4fad6aab 100644 --- a/dot-config/zed/settings_backup.json +++ b/dot-config/zed/settings_backup.json @@ -7,12 +7,14 @@ // custom settings, run `zed: open default settings` from the // command palette (cmd-shift-p / ctrl-shift-p) { + "format_on_save": "on", + "languages": {}, "agent_servers": { - "opencode": { - "type": "registry" - } - }, - "cli_default_open_behavior": "new_window", + "opencode": { + "type": "registry", + }, + }, + "cli_default_open_behavior": "new_window", "outline_panel": { "dock": "left", }, @@ -48,6 +50,10 @@ "use_system_clipboard": "on_yank", }, "edit_predictions": { + "codestral": { + "model": "codestral-latest", + "api_url": "https://codestral.mistral.ai", + }, "allow_data_collection": "no", "provider": "copilot", "disabled_globs": [], @@ -134,7 +140,7 @@ "node": { "npm_path": "bun", }, - "base_keymap": "VSCode", + "base_keymap": "Zed", "status_bar": { "experimental.show": true, }, @@ -149,4 +155,21 @@ "ui_font_size": 18.0, "buffer_font_size": 15.0, "theme": "wal", + "completions": { + "lsp_insert_mode": "insert", + }, + "lsp": { + "rust-analyzer": { + "initialization_options": { + "check": { + "command": "clippy", + }, + }, + }, + "qmljs": { + "binary": { + "path": "/usr/bin/qmlls", + }, + }, + }, } diff --git a/dot-gitconfig b/dot-gitconfig index fa49189c..927ef0a9 100644 --- a/dot-gitconfig +++ b/dot-gitconfig @@ -40,3 +40,31 @@ [merge "mergiraf"] name = mergiraf driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L +[diff] + # Set difftastic as the default difftool, so we don't need to specify + # `-t difftastic` every time. + tool = difftastic + external = difft --color=auto# --display=inline +[difftool "difftastic"] + # See `man git-difftool` for a description of MERGED, LOCAL and REMOTE. + cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644" +[difftool] + # Run the difftool immediately, don't ask 'are you sure' each time. + prompt = false + +[pager] + # Use a pager if the difftool output is larger than one screenful, + # consistent with the behaviour of `git diff`. + diff = delta + log = delta + reflog = delta + show = delta + difftool = true + +[interactive] + diffFilter = delta --color-only + +[delta] + navigate = true + side-by-side = true + line-numbers = true diff --git a/dot-hyperhdr/db/hyperhdr.db b/dot-hyperhdr/db/hyperhdr.db index 1cb9d8b5..d547d7d3 100644 --- a/dot-hyperhdr/db/hyperhdr.db +++ b/dot-hyperhdr/db/hyperhdr.db @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d24ab358aaee0e4ac0256e1ee9f042a7fb10a4d3949e99aa47d16017e24a2c5 +oid sha256:9bdf714400f7492888e66e6df4c8f34d519aa9ea7962268f0b1e065bb9518230 size 57344 diff --git a/dot-local/share/fcitx5/rime/sync/55354f48-4773-4a5d-877f-cd0b880659d6/jyutping.custom.yaml b/dot-local/share/fcitx5/rime/sync/55354f48-4773-4a5d-877f-cd0b880659d6/jyutping.custom.yaml new file mode 100644 index 00000000..565e420d --- /dev/null +++ b/dot-local/share/fcitx5/rime/sync/55354f48-4773-4a5d-877f-cd0b880659d6/jyutping.custom.yaml @@ -0,0 +1,23 @@ +patch: + "speller/algebra/+": + # 1. Vowel length blindness (tai = taai, sam = saam) + - derive/a/aa/ + - derive/aa/a/ + + # 2. Initials 懶音 (n -> l, ng -> m, gw -> g, kw -> k) + - derive/^n/l/ # nei -> lei + - derive/^ng/m/ # ngau -> mau + - derive/^gw/g/ # gwok -> gok + - derive/^kw/k/ # kwong -> kong + + # 3. Optional ng- initial (nga = a, ngo = o) + - derive/^ng([aeiou])/$1/ + - derive/^([aeiou])/ng$1/ + + # 4. Finals 懶音 (n/ng, t/k, m/ng, p/k bleeding together) + - derive/n$/ng/ # san -> sang + - derive/ng$/n/ # sang -> san + - derive/t$/k/ # sat -> sak + - derive/k$/t/ # sak -> sat + - derive/m$/ng/ # sam -> sang + - derive/p$/k/ # sap -> sak diff --git a/dot-local/share/fcitx5/rime/sync/55354f48-4773-4a5d-877f-cd0b880659d6/user.yaml b/dot-local/share/fcitx5/rime/sync/55354f48-4773-4a5d-877f-cd0b880659d6/user.yaml index cfea227e..00e71aab 100644 --- a/dot-local/share/fcitx5/rime/sync/55354f48-4773-4a5d-877f-cd0b880659d6/user.yaml +++ b/dot-local/share/fcitx5/rime/sync/55354f48-4773-4a5d-877f-cd0b880659d6/user.yaml @@ -1,8 +1,8 @@ var: - last_build_time: 1784364248 + last_build_time: 1789194373 option: simplification: true previously_selected_schema: jyut6ping3 schema_access_time: - jyut6ping3: 1782313956 + jyut6ping3: 1788875219 terra_pinyin: 1726651097
\ No newline at end of file diff --git a/dot-zen/main/chrome/Zen-Nebula b/dot-zen/main/chrome/Zen-Nebula -Subproject 07ad877d24b0e165c424b9010f02a18e5c4df22 +Subproject a084d0263264e19fdb6dbdf403a6ecb44d281fe diff --git a/dot-zen/main/chrome/zen-themes.css b/dot-zen/main/chrome/zen-themes.css index 5205fb5a..f7d0cecf 100644 --- a/dot-zen/main/chrome/zen-themes.css +++ b/dot-zen/main/chrome/zen-themes.css @@ -1,5 +1,5 @@ /* Zen Mods - Generated by ZenMods. -* FILE GENERATED AT: Wednesday, December 31, 2025 at 8:40:31 PM Hong Kong Standard Time +* FILE GENERATED AT: Sunday, September 6, 2026 at 7:25:43 PM Hong Kong Standard Time * DO NOT EDIT THIS FILE DIRECTLY! * Your changes will be overwritten. * Instead, go to the preferences and edit the mods there. @@ -865,7 +865,7 @@ /* Description: Make the Zen Browser's tab background transparent, get smooth animations and more. Enable features in mod settings and visit the homepage below to learn more about the features. 👇 */ /* Author: @sameerasw */ /* variables */ -:root { +.zen-browser-generic-background { @media -moz-pref( "mod.sameerasw.zen_bg_color_enabled") { --zen-main-browser-background: var( --mod-sameerasw-zen_transparency_color, @@ -908,7 +908,7 @@ /* tab tint */ :root:has([mod-sameerasw_zen_light_tint="1"]) { .browserStack { - browser { + & > browser { background-color: light-dark( rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.1) @@ -919,7 +919,7 @@ :root:has([mod-sameerasw_zen_light_tint="2"]) { .browserStack { - browser { + & > browser { background-color: transparent !important; } } diff --git a/dot-zen/main/chrome/zen-themes/642854b5-88b4-4c40-b256-e035532109df/chrome.css b/dot-zen/main/chrome/zen-themes/642854b5-88b4-4c40-b256-e035532109df/chrome.css index c23c66c3..b6b3cf04 100644 --- a/dot-zen/main/chrome/zen-themes/642854b5-88b4-4c40-b256-e035532109df/chrome.css +++ b/dot-zen/main/chrome/zen-themes/642854b5-88b4-4c40-b256-e035532109df/chrome.css @@ -1,5 +1,5 @@ /* variables */ -:root { +.zen-browser-generic-background { @media -moz-pref( "mod.sameerasw.zen_bg_color_enabled") { --zen-main-browser-background: var( --mod-sameerasw-zen_transparency_color, @@ -42,7 +42,7 @@ /* tab tint */ :root:has([mod-sameerasw_zen_light_tint="1"]) { .browserStack { - browser { + & > browser { background-color: light-dark( rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.1) @@ -53,7 +53,7 @@ :root:has([mod-sameerasw_zen_light_tint="2"]) { .browserStack { - browser { + & > browser { background-color: transparent !important; } } diff --git a/etc/NetworkManager/NetworkManager.conf b/etc/NetworkManager/NetworkManager.conf new file mode 100644 index 00000000..43805e40 --- /dev/null +++ b/etc/NetworkManager/NetworkManager.conf @@ -0,0 +1,5 @@ +# Configuration file for NetworkManager. +# See "man 5 NetworkManager.conf" for details. +[connectivity] +uri=http://ping.archlinux.org/nm +response=NetworkManager is online diff --git a/pkgbuilds/helix-git/PKGBUILD b/pkgbuilds/helix-git/PKGBUILD index 6a5596c2..552d6805 100644 --- a/pkgbuilds/helix-git/PKGBUILD +++ b/pkgbuilds/helix-git/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Wojciech Kępka (wojciech@wkepka.dev) pkgname=helix-git _pkgname=helix -pkgver=22.12.r3371.g9c42335d +pkgver=22.12.r3401.g048e3e3f pkgrel=1 pkgdesc="A text editor written in rust" url="https://helix-editor.com" |
