diff --git a/home/dot_aliases b/home/dot_aliases index 6ab13e0..d05acdf 100644 --- a/home/dot_aliases +++ b/home/dot_aliases @@ -35,12 +35,12 @@ if [ $(command -v cargo) ]; then alias co="cargo outdated" fi -if [ $(command -v exa) ]; then - alias l="exa" - alias ls="exa --git" - alias la="exa -a --git" - alias ll="exa -lab --time-style=long-iso --git" - alias tree='exa -al --tree --git-ignore --git -I ".git"' +if [ $(command -v eza) ]; then + alias l="eza" + alias ls="eza --git" + alias la="eza -a --git" + alias ll="eza -lab --time-style=long-iso --git" + alias tree='eza -al --tree --git-ignore --git -I ".git"' else alias l="ls" alias la="ls -a" diff --git a/home/dot_config/alacritty/alacritty.yml b/home/dot_config/alacritty/alacritty.yml index d9ea9aa..2cd9265 100644 --- a/home/dot_config/alacritty/alacritty.yml +++ b/home/dot_config/alacritty/alacritty.yml @@ -21,5 +21,5 @@ shell: - -c - 'tmux new -A -s default' import: - - ~/.config/alacritty/themes/themes/tokyo-night-storm.yaml + - ~/.config/alacritty/themes/themes/kanagawa_dragon.yaml diff --git a/home/dot_config/git/config b/home/dot_config/git/config index a27c870..88bb5a0 100644 --- a/home/dot_config/git/config +++ b/home/dot_config/git/config @@ -19,3 +19,8 @@ gpgsign = true [merge] conflictStyle = diff3 + +[delta] + side-by-side = true + line-numbers = true + navigate = true diff --git a/home/dot_config/yabai/executable_yabairc b/home/dot_config/yabai/executable_yabairc index 56ad0c8..08219b1 100644 --- a/home/dot_config/yabai/executable_yabairc +++ b/home/dot_config/yabai/executable_yabairc @@ -1,5 +1,5 @@ yabai -m config \ - mouse_follows_focus on \ + mouse_follows_focus off \ focus_follows_mouse autoraise \ window_origin_display default \ window_placement second_child \ diff --git a/home/dot_zshrc b/home/dot_zshrc index 94da0e6..2a8e575 100644 --- a/home/dot_zshrc +++ b/home/dot_zshrc @@ -96,7 +96,10 @@ if command -v pyenv 1>/dev/null 2>&1; then fi # cargo -source "$HOME/.cargo/env" +[ -d "$HOME/.cargo" ] && source "$HOME/.cargo/env" + +# rye +[ -d "$HOME/.rye" ] && source "$HOME/.rye/env" # The next line enables shell command completion for gcloud. if [ -f '/Users/ikanago/google-cloud-sdk/completion.zsh.inc' ]; then . '/Users/ikanago/google-cloud-sdk/completion.zsh.inc'; fi