diff --git a/.zshrc b/.zshrc
index 3838c438..4e9f8932 100644
--- a/.zshrc
+++ b/.zshrc
@@ -19,9 +19,8 @@
 # fi
 
 export DOTFILES="$HOME/.dotfiles"
-export CFG="$DOTFILES/.config"
-export DOTBIN="$HOME/.config/bin"
-export DOTBIN_META="$HOME/.config/.bin"
+export CFG="$HOME/.config"
+export DOTBIN="$CFG/bin"
 
 # Load sofmani-managed zsh plugins
 
@@ -96,5 +95,5 @@ export VISUAL="$EDITOR"
 
 source "$DOTFILES/aliases.zsh"
 
-[[ ! -f "$HOME/.config/.p10k.zsh" ]] || source "$HOME/.config/.p10k.zsh"
+[[ ! -f "$CFG/.p10k.zsh" ]] || source "$CFG/.p10k.zsh"
 
diff --git a/aliases.zsh b/aliases.zsh
index 258de663..bf309cec 100755
--- a/aliases.zsh
+++ b/aliases.zsh
@@ -117,12 +117,12 @@ alias dvp="docker-volume-path"
 alias ldc="lazydocker"
 
 # tmux
-alias tmux="tmux -f ~/.config/tmux/conf.tmux"
+alias tmux="tmux -f \$CFG/tmux/conf.tmux"
 alias tn="tmux new"
 alias tns="tmux new -s"
 alias tas="tmux attach -t"
 alias tlw="tmux list-windows"
-alias trl="tmux source-file ~/.config/tmux/conf.tmux"
+alias trl="tmux source-file \$CFG/tmux/conf.tmux"
 alias trn="tmux rename-session -t"
 alias tks="tmux kill-server"
 alias tk="tx kill"
@@ -169,9 +169,8 @@ alias get-gh-token="op item get github --fields 'CI Access Token' --reveal"
 alias opsign="eval \$(op signin)"
 
 # sofmani/config
-alias cfg-update-sofmani="sofmani -u -f tag:sofmani-config"
 alias cfg-update="sofmani -u -f tag:config"
-alias cfg-edit="vi ~/.dotfiles/.config/sofmani.yml; cp ~/.dotfiles/.config/sofmani.yml ~/.config/"
+alias cfg-edit="vi \$CFG/sofmani.yml"
 
 # atuin
 alias asc="atuin script run"
@@ -180,14 +179,6 @@ alias atu="atuin"
 # database
 alias lsq="lazysql"
 
-# gi_gen
-# [d]ev gi_gen
-alias dgi_gen="\$GOBIN/gi_gen"
-# [g]lobal gi_gen
-alias ggi_gen="\$DOTBIN/gi_gen"
-# go [i]nstall & run gi_gen
-alias igi_gen="go install && dgi_gen"
-
 # general
 alias serve="open http://localhost:\${PORT:-3001} & http-server -p \${PORT:-3001}"
 alias afk="/System/Library/CoreServices/Menu\ Extras/User.menu/Contents/Resources/CGSession -suspend"
@@ -204,7 +195,6 @@ if is_linux; then
 fi
 alias lssh="lazyssh"
 alias lvim="nvim -c':e#<1'"
-alias cfg-reload="cp ~/.dotfiles/.config/sofmani.yml ~/.config/"
 alias sm="sofmani"
 alias gop="git open"
 alias exp="cospend -p home-2026"