From 05244511c23730650c254305db16d1684fd659c1 Mon Sep 17 00:00:00 2001
From: Tri Vo Khac <me@trivk.dev>
Date: Sat, 19 Apr 2025 10:54:42 +0700
Subject: [PATCH] chore: update git configuration and remove unused files

- Updated Git user email in `.gitconfig`.
- Removed obsolete Kitty and Topgrade configuration files.
- Cleaned up Zsh configuration by removing unused snippets and scripts, and reorganized plugin loading in `.zshrc`.
---
 git/.gitconfig                                |   7 +-
 kitty/.config/kitty/.kitty.conf.swp           | Bin 20480 -> 0 bytes
 kitty/.config/kitty/kitty.conf                |  18 ---
 topgrade/.config/topgrade.toml                | 104 ------------------
 zsh/.config/zsh/.zshrc                        |  85 +++++++++-----
 .../{snippets/aliases => config/alias.zsh}    |   0
 zsh/.config/zsh/config/bin.zsh                |  42 +++++++
 .../{snippets/exports => config/default.zsh}  |   1 -
 .../{snippets/options => config/shell.zsh}    |   0
 zsh/.config/zsh/snippets/bin                  |  37 -------
 zsh/.config/zsh/{zinit => zinit.zsh}          |   0
 zsh/.zshenv                                   |   6 +-
 12 files changed, 103 insertions(+), 197 deletions(-)
 delete mode 100644 kitty/.config/kitty/.kitty.conf.swp
 delete mode 100644 kitty/.config/kitty/kitty.conf
 delete mode 100644 topgrade/.config/topgrade.toml
 rename zsh/.config/zsh/{snippets/aliases => config/alias.zsh} (100%)
 create mode 100644 zsh/.config/zsh/config/bin.zsh
 rename zsh/.config/zsh/{snippets/exports => config/default.zsh} (79%)
 rename zsh/.config/zsh/{snippets/options => config/shell.zsh} (100%)
 delete mode 100644 zsh/.config/zsh/snippets/bin
 rename zsh/.config/zsh/{zinit => zinit.zsh} (100%)

diff --git a/git/.gitconfig b/git/.gitconfig
index 81b8495..af09f62 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -2,11 +2,6 @@
 	defaultBranch = main
 [user]
 	name = Tri Vo Khac
-	email = 33442340+vokhactri@users.noreply.github.com
-[filter "lfs"]
-	required = true
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
+	email = me@trivk.dev
 [push]
 	autoSetupRemote = true
diff --git a/kitty/.config/kitty/.kitty.conf.swp b/kitty/.config/kitty/.kitty.conf.swp
deleted file mode 100644
index 3466f7aff9421c7b5469beef8d1743be0ae9e700..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
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
YjeFXMR>OuS81x_66U#Vxcf|$$-_Lfc@Bjb+

diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
deleted file mode 100644
index 4ff419a..0000000
--- a/kitty/.config/kitty/kitty.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# vim:fileencoding=utf-8:foldmethod=marker
-
-font_family      JetBrainsMono Nerd Font Regular
-bold_font        JetBrainsMono Nerd Font Bold
-italic_font      JetBrainsMono Nerd Font Italic
-bold_italic_font JetBrainsMono Nerd Font Bold Italic
-
-font_size 13.0
-
-background_opacity 0.85
-
-allow_hyperlinks yes
-
-shell_integration enabled
-
-macos_option_as_alt yes
-
-# include ./mocha.conf
diff --git a/topgrade/.config/topgrade.toml b/topgrade/.config/topgrade.toml
deleted file mode 100644
index 0e800b9..0000000
--- a/topgrade/.config/topgrade.toml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Don't ask for confirmations
-#assume_yes = true
-
-# Disable specific steps - same options as the command line flag
-disable = ["system", "emacs", "gem", "node", "pnpm", "pip3", "micro", "containers"]
-
-display_preamble = false
-
-# Ignore failures for these steps
-#ignore_failures = ["powershell"]
-
-# Run specific steps - same options as the command line flag
-#only = ["system", "emacs"]
-
-# Do not ask to retry failed steps (default: false)
-#no_retry = true
-
-# Run inside tmux
-#run_in_tmux = true
-
-# List of remote machines with Topgrade installed on them
-#remote_topgrades = ["toothless", "pi", "parnas"]
-
-# Arguments to pass SSH when upgrading remote systems
-#ssh_arguments = "-o ConnectTimeout=2"
-
-# Path to Topgrade executable on remote machines
-#remote_topgrade_path = ".cargo/bin/topgrade"
-
-# Arguments to pass tmux when pulling Repositories
-#tmux_arguments = "-S /var/tmux.sock"
-
-# Do not set the terminal title
-#set_title = false
-
-# Display the time in step titles
-# display_time = true
-
-# Cleanup temporary or old files
-#cleanup = true
-
-[git]
-#max_concurrency = 5
-# Additional git repositories to pull
-#repos = [
-#    "~/src/*/",
-#    "~/.config/something"
-#]
-
-# Don't pull the predefined git repos
-#pull_predefined = false
-
-# Arguments to pass Git when pulling Repositories
-#arguments = "--rebase --autostash"
-
-[composer]
-#self_update = true
-
-# Commands to run before anything
-[pre_commands]
-#"Emacs Snapshot" = "rm -rf ~/.emacs.d/elpa.bak && cp -rl ~/.emacs.d/elpa ~/.emacs.d/elpa.bak"
-
-# Custom commands
-[commands]
-#"Python Environment" = "~/dev/.env/bin/pip install -i https://pypi.python.org/simple -U --upgrade-strategy eager jupyter"
-
-[brew]
-#greedy_cask = true
-
-[linux]
-# Arch Package Manager to use. Allowed values: autodetect, trizen, paru, yay, pikaur, pacman.
-#arch_package_manager = "pacman"
-# Arguments to pass yay (or paru) when updating packages
-#yay_arguments = "--nodevel"
-#show_arch_news = true
-#trizen_arguments = "--devel"
-#pikaur_arguments = ""
-#enable_tlmgr = true
-#emerge_sync_flags = "-q"
-#emerge_update_flags = "-uDNa --with-bdeps=y world"
-#redhat_distro_sync = false
-#rpm_ostree = false
-
-[windows]
-# Manually select Windows updates
-#accept_all_updates = false
-#open_remotes_in_new_terminal = true
-
-# Causes Topgrade to rename itself during the run to allow package managers
-# to upgrade it. Use this only if you installed Topgrade by using a package
-# manager such as Scoop to Cargo
-#self_rename = true
-
-[npm]
-# Use sudo if the NPM directory isn't owned by the current user
-#use_sudo = true
-
-[firmware]
-# Offer to update firmware; if false just check for and display available updates
-#upgrade = true
-
-[flatpak]
-# Use sudo for updating the system-wide installation
-#use_sudo = true
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 50fdf08..89a7134 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -1,38 +1,67 @@
 # install zinit
-source $ZDOTDIR/zinit
+source $ZDOTDIR/zinit.zsh
 
-# load remote plugins
-zinit wait lucid light-mode id-as depth"1" for \
+zinit light zdharma-continuum/zinit-annex-bin-gem-node
+zinit light zdharma-continuum/zinit-annex-binary-symlink
+
+zinit wait lucid light-mode id-as depth'1' for \
     wintermi/zsh-brew \
     hlissner/zsh-autopair \
     Aloxaf/fzf-tab \
-    atinit"zicompinit; zicdreplay -q" \
+    atinit'zicompinit; zicdreplay -q' \
         zdharma-continuum/fast-syntax-highlighting \
-    atload"_zsh_autosuggest_start" \
+    atload'_zsh_autosuggest_start' \
         zsh-users/zsh-autosuggestions
 
-# load prompt theme
-zinit ice as"command" from"gh-r" id-as \
-    atclone"./starship init zsh > init.zsh; ./starship completions zsh > _starship" \
-    atpull"%atclone" src"init.zsh"
-zinit light starship/starship
+zinit id-as from'gh-r' lbin'!' null for \
+    lsd-rs/lsd \
+    zyedidia/micro \
+    @sharkdp/bat
 
-# load binaries
-zinit as"command" wait lucid light-mode from"gh-r" id-as for \
-    extract"!" lsd-rs/lsd \
-    extract"!" zyedidia/micro \
-    extract"!" cp"autocomplete/bat.zsh -> _bat" @sharkdp/bat \
-    extract"!" pick"usr/bin/fastfetch" \
-        fastfetch-cli/fastfetch \
-    atclone"./zoxide init zsh > init.zsh" atpull"%atclone" src"init.zsh" \
-        ajeetdsouza/zoxide \
-    atclone"./fzf --zsh > init.zsh" atpull="%atclone" src"init.zsh" \
-        junegunn/fzf \
-    atclone"./fnm env --use-on-cd --shell zsh > init.zsh; ./fnm completions --shell zsh > _fnm" atpull"%atclone" src"init.zsh" Schniz/fnm
+zinit for \
+    id-as \
+    from'gh-r' \
+    sbin'!**/bin/fastfetch -> fastfetch' \
+    @fastfetch-cli/fastfetch
 
-# load local scripts
-zinit is-snippet id-as for \
-    $ZDOTDIR/snippets/exports \
-    $ZDOTDIR/snippets/aliases \
-    $ZDOTDIR/snippets/options \
-    $ZDOTDIR/snippets/bin
+zinit for \
+    id-as \
+    atload'eval "$(zoxide init zsh)"' \
+    from'gh-r' \
+    lbin'!' \
+    @ajeetdsouza/zoxide
+
+zinit for \
+    id-as \
+    as'completion' \
+    atclone'./fnm completions --shell zsh > _fnm.zsh' \
+    atload'eval "$(fnm env --use-on-cd --shell zsh)"' \
+    atpull'%atclone' \
+    blockf \
+    from'gh-r' \
+    nocompile \
+    sbin'fnm' \
+    @Schniz/fnm
+
+zinit for \
+    id-as \
+    as'completion' \
+    atclone'./starship completions zsh > _starship' \
+    atpull'%atclone' \
+    atload'eval "$(starship init zsh)"' \
+    from'gh-r' \
+    sbin'**/starship -> starship' \
+    @starship/starship
+
+zinit for \
+    id-as \
+    from'gh-r'  \
+    lbin'!fzf'  \
+    atclone'fzf --zsh > fzf.zsh' \
+    atpull'%atclone' \
+    src'fzf.zsh' \
+    @junegunn/fzf
+
+for script in $ZDOTDIR/config/*.zsh; do
+    source "$script"
+done
diff --git a/zsh/.config/zsh/snippets/aliases b/zsh/.config/zsh/config/alias.zsh
similarity index 100%
rename from zsh/.config/zsh/snippets/aliases
rename to zsh/.config/zsh/config/alias.zsh
diff --git a/zsh/.config/zsh/config/bin.zsh b/zsh/.config/zsh/config/bin.zsh
new file mode 100644
index 0000000..1eddb1f
--- /dev/null
+++ b/zsh/.config/zsh/config/bin.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+
+# Define a marker file (choose a location in your cache or temp directory)
+MARKER_FILE="${XDG_CACHE_HOME:-$HOME/.cache}/gnu_tools_symlinked"
+
+if [[ ! -f "$MARKER_FILE" ]]; then
+    gnu_tools=(
+        "coreutils"
+        "findutils"
+        "gnu-tar"
+        "gnu-sed"
+        "gawk"
+        "gnu-indent"
+        "grep"
+    )
+
+    for tool in $gnu_tools; do
+        gnubin="/opt/homebrew/opt/$tool/libexec/gnubin"
+        if [ -d "$gnubin" ]; then
+            for bin in "$gnubin"/*; do
+                ln -sf "$bin" "$XDG_BIN_HOME/$(basename "$bin")"
+            done
+        fi
+    done
+
+    # Create the marker file to indicate the script has run
+    touch "$MARKER_FILE"
+fi
+
+
+local bin_paths=(
+    "$XDG_BIN_HOME"
+    "/opt/homebrew/opt/gnu-getopt/bin"
+)
+for bin_path in "${bin_paths[@]}"; do
+    if [ -d "$bin_path" ]; then
+        case ":$PATH:" in
+            *":$bin_path:"*) ;;
+            *) PATH="$bin_path:$PATH" ;;
+        esac
+    fi
+done
diff --git a/zsh/.config/zsh/snippets/exports b/zsh/.config/zsh/config/default.zsh
similarity index 79%
rename from zsh/.config/zsh/snippets/exports
rename to zsh/.config/zsh/config/default.zsh
index 3d1cc39..b1b2ffe 100644
--- a/zsh/.config/zsh/snippets/exports
+++ b/zsh/.config/zsh/config/default.zsh
@@ -6,6 +6,5 @@ export EDITOR="micro"
 export PAGER="bat"
 export VISUAL="micro"
 export SUDO_EDITOR="micro"
-export COMPANY_DIR="$HOME/Documents/work/company/"
 
 export STARSHIP_CONFIG="$XDG_CONFIG_HOME"/starship/starship.toml
diff --git a/zsh/.config/zsh/snippets/options b/zsh/.config/zsh/config/shell.zsh
similarity index 100%
rename from zsh/.config/zsh/snippets/options
rename to zsh/.config/zsh/config/shell.zsh
diff --git a/zsh/.config/zsh/snippets/bin b/zsh/.config/zsh/snippets/bin
deleted file mode 100644
index 068af8c..0000000
--- a/zsh/.config/zsh/snippets/bin
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env zsh
-
-# Add GNU tools to PATH without 'g' prefix
-local gnu_tools=(
-    "coreutils"
-    "findutils"
-    "gnu-tar"
-    "gnu-sed"
-    "gawk"
-    "gnu-indent"
-    "grep"
-)
-
-for tool in $gnu_tools; do
-    local gnubin="/opt/homebrew/opt/$tool/libexec/gnubin"
-    if [ -d "$gnubin" ]; then
-        case ":$PATH:" in
-            *":$gnubin:"*) ;;
-            *) export PATH="$gnubin:$PATH" ;;
-        esac
-    fi
-done
-
-# Add other bins separately since they have a different path structure
-local bin_paths=(
-    "$HOME/.local/bin"
-    "/opt/homebrew/opt/gnu-getopt/bin"
-)
-for bin_path in $bin_paths; do
-    if [ -d "$bin_path" ]; then
-        case ":$PATH:" in
-            *":$bin_path:"*) ;;
-            *) export PATH="$bin_path:$PATH" ;;
-        esac
-    fi
-done
-
diff --git a/zsh/.config/zsh/zinit b/zsh/.config/zsh/zinit.zsh
similarity index 100%
rename from zsh/.config/zsh/zinit
rename to zsh/.config/zsh/zinit.zsh
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 9090bf3..b8aa3ec 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,3 +1,3 @@
-export XDG_CONFIG_HOME="${HOME}/.config"
-export ZDOTDIR="${XDG_CONFIG_HOME}/zsh"
-export SHELL_SESSIONS_DISABLE=1
+XDG_CONFIG_HOME="${HOME}/.config"
+XDG_BIN_HOME="${HOME}/.local/bin"
+ZDOTDIR="${XDG_CONFIG_HOME}/zsh"