Merge branch 'main' into feat/fedora

.chezmoiscripts/run_once_after_01-chores.sh.tmpl

@@ -1,7 +1,7 @@
 #!/bin/zsh
 set -uxo pipefail
 
-mkdir ~/Develop
+mkdir -p ~/Develop
 
 {{ if eq .chezmoi.os "linux" -}}
 {{ if eq .chezmoi.osRelease.id "fedora" -}}

dot_Brewfile

@@ -33,9 +33,9 @@ cask "1password-cli"
 cask "appcleaner"
 cask "brave-browser"
 cask "discord"
-cask "docker"
 cask "font-meslo-lg-nerd-font"
 cask "karabiner-elements"
+cast "orbstack"
 cask "slack"
 cask "wezterm"
 cask "zoom"

dot_gitconfig

@@ -1,11 +1,22 @@
+[branch]
+	sort = -committerdate
 [color]
 	ui = auto
-[user]
-	name = granddaifuku
-	email = daifukuformac@gmail.com
-[pull]
-	ff = only
+[diff]
+	algorithm = histogram
+	colorMoved = default
 [http]
 	postBuffer = 2M
 [init]
 	defaultBranch = main
+[log]
+	date = iso
+[pull]
+	ff = only
+[push]
+	autoSetupRemote = true
+[rebase]
+	autostash = true
+[user]
+	name = granddaifuku
+	email = daifukuformac@gmail.com

dot_zshenv.tmpl

@@ -34,6 +34,7 @@ HISTFILE="${ZDOTDIR}/.zsh_history"
 
 ### enhancd
 export ENHANCD_FILTER="fzf --reverse --prompt='Dir > '"
+export ENHANCD_DIR="${XDG_DATA_HOME}/enhancd"
 
 ## Starship
 export STARSHIP_CONFIG="${XDG_CONFIG_HOME}/starship/starship.toml"
@@ -43,10 +44,8 @@ export STARSHIP_CONFIG="${XDG_CONFIG_HOME}/starship/starship.toml"
 export WEZTERM_CONFIG_FILE="${XDG_CONFIG_HOME}/wezterm/wezterm.lua"
 
 
+{{- if ne .chezmoi.os "darwin" }}
 ## Docker
-{{ if eq .chezmoi.os "darwin" -}}
-export PATH=$PATH:/usr/local/bin/docker
-{{- else -}}
 export DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker"
 export PATH="$PATH:${DOCKER_CONFIG}/bin"
 {{- end }}

private_dot_config/zsh/abbreviations → private_dot_config/zsh/abbreviations.tmpl

@@ -1,30 +1,45 @@
 abbr emc="emacsclient -c -a ''"
 abbr kemc="emacsclient -e '(kill-emacs)'"
+
 abbr kbct="kubectl"
 abbr kbcta="kubectl apply -f"
 abbr kbctd="kubectl delete -f"
 abbr kbctg="kubectl get"
 abbr kbctl="kubectl logs"
+
 abbr g="git"
 abbr ga="git add"
 abbr gb="git branch"
 abbr gba="git branch -a"
-abbr gbd="git branch -d"
+abbr gbd="git branch -D"
 abbr gcl="git clone"
 abbr gcm="git commit -m"
 abbr gco="git checkout"
-abbr gcob="git checkout -b"
 abbr gd="git diff"
 abbr gf="git fetch"
 abbr gl="git log"
 abbr glg="git log --graph"
 abbr gpl="git pull"
 abbr gph="git push"
+abbr grs="git reset --soft"
 abbr gs="git status"
 abbr gst="git stash"
 abbr gstp="git stash pop"
 abbr gsw="git switch"
+abbr gswc="git switch -c"
+
 abbr dcd="docker compose down -v"
 abbr dcu="docker compose up -d"
 abbr dps="docker ps -a"
 abbr dr="docker rm"
+
+{{ if eq .chezmoi.os "darwin" -}}
+abbr brw="brew"
+abbr brwar="brew autoremove"
+abbr brwi="brew install"
+abbr brwl="brew list"
+abbr brws="brew search"
+abbr brwun="brew uninstall"
+abbr brwup="brew upgrade"
+abbr brwuc="brew upgrade --cask --greedy"
+{{ end -}}