Merge branch 'develop'

Author: codejsha

linux/alacritty /alacritty.toml

@@ -0,0 +1,19 @@
+[font]
+size = 13.0
+offset.y = 1
+
+[font.normal]
+family = "Hack Nerd Font"
+style = "Regular"
+
+[font.bold]
+family = "Hack Nerd Font"
+style = "Bold"
+
+[font.bold_italic]
+family = "Hack Nerd Font"
+style = "Bold Italic"
+
+[font.italic]
+family = "Hack Nerd Font"
+style = "Italic"

linux/hyper/.hyper.js

@@ -1,6 +1,6 @@
 eval "$(/opt/homebrew/bin/brew shellenv)"
 
-export LANG=en_US.UTF-8
+export LANG="en_US.UTF-8"
 export GPG_TTY="$(tty)"
 
 # Added by Toolbox App

macos/lsd/colors-default.yaml linux/lsd/colors-default.yamlmacos/lsd/colors-default.yaml renamed to linux/lsd/colors-default.yaml

@@ -9,9 +9,14 @@ plugins=(aliases brew copypath docker docker-compose dotnet forklift fzf gh git
 fpath+=${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions/src
 source ${ZSH}/oh-my-zsh.sh
 
-### starship
+### shell integration
 export STARSHIP_CONFIG="${HOME}/.config/starship/starship.toml"
 eval "$(starship init zsh)"
+eval "$(zoxide init zsh)"
+eval "$(atuin init zsh --disable-up-arrow)"
+source ${HOMEBREW_PREFIX}/opt/git-extras/share/git-extras/git-extras-completion.zsh
+source ${HOMEBREW_PREFIX}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+source ${HOMEBREW_PREFIX}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 
 ### terminal title
 case ${TERM} in
@@ -25,8 +30,6 @@ export LS_COLORS="di=36:ln=38;5;210:or=31:so=32:pi=33:ex=32:bd=34;46:cd=34;43:su
 export PATH="/opt/homebrew/opt/llvm/bin:${PATH}"
 export PATH="${HOME}/go/bin:${PATH}"
 export PATH="${HOME}/.krew/bin:${PATH}"
-export LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
-export CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
 export JAVA_HOME="/Library/Java/JavaVirtualMachines/microsoft-21.jdk/Contents/Home"
 export GROOVY_HOME="/opt/homebrew/opt/groovysdk/libexec"
 
@@ -36,25 +39,21 @@ alias ll="lsd -alh"
 alias vi="nvim"
 alias vim="nvim"
 alias vimdiff="nvim -d"
-alias bat="bat --style=plain --paging=never"
+alias cat="bat --style=plain --paging=never"
 alias vcpkg="${HOME}/tools/vcpkg/vcpkg"
 alias mysql="/opt/homebrew/opt/mysql-client@8.4/bin/mysql"
 alias mysqldump="/opt/homebrew/opt/mysql-client@8.4/bin/mysqldump"
 
 ### logging commands
 preexec() {
-  local TARGET_COMMANDS="aws|bat|brew|curl|docker|fd|git|go|helm|http|istioctl|jar|java|jcmd|jq|jstack|kubectl|kustomize|make|python3|rg|sudo|tekton|vault|xargs"
+  local TARGET_COMMANDS="aws|bat|brew|curl|docker|fd|git|go|helm|http|jar|java|jcmd|jq|jstack|kubectl|kustomize|make|npm|perl|pip|poetry|python3|rg|sudo|tekton|vault|xargs|yarn|yq"
   local command=${1}
   local command_base=${command%% *}
   local command_rest=${command#"${command_base}"}
   local actual_command=$(whence -- "${command_base}" || echo "${command_base}")
   [[ ${actual_command} =~ ^($TARGET_COMMANDS) ]] && echo "+ ${actual_command}${command_rest}"
 }
 
-source ${HOMEBREW_PREFIX}/opt/git-extras/share/git-extras/git-extras-completion.zsh
-source ${HOMEBREW_PREFIX}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-source ${HOMEBREW_PREFIX}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-
 function cddownloads() { DIRECTORY="${HOME}/Downloads"; echo "+ cd ${DIRECTORY}">&2; cd ${DIRECTORY} || exit; STATUS="${?}"; if [ "${STATUS}" -eq "0" ]; then lsd -alh; fi; }
 function cdrepos() { DIRECTORY="${HOME}/source/repos"; echo "+ cd ${DIRECTORY}">&2; cd ${DIRECTORY} || exit; STATUS="${?}"; if [ "${STATUS}" -eq "0" ]; then lsd -alh; fi; }
 function cdcoderepos() { DIRECTORY="${HOME}/source/coderepos"; echo "+ cd ${DIRECTORY}">&2; cd ${DIRECTORY} || exit; STATUS="${?}"; if [ "${STATUS}" -eq "0" ]; then lsd -alh; fi; }