From 21acdcf4de79469b078c960a12275102c8e42207 Mon Sep 17 00:00:00 2001 From: tastytea Date: Fri, 19 Aug 2022 23:49:33 +0200 Subject: [PATCH] dotfiles: record work tree in git config --- .config/zsh/aliases.zsh | 2 +- .local/bin/setup_dotfiles.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.config/zsh/aliases.zsh b/.config/zsh/aliases.zsh index 028a1ec..59737fa 100644 --- a/.config/zsh/aliases.zsh +++ b/.config/zsh/aliases.zsh @@ -45,7 +45,7 @@ alias ta="tmux attach -t tastytea || tmux new-session -s tastytea" alias exifremove='exiftool -all=' -local _tmp_config_alias='git --git-dir=${HOME}/.dotfiles/ --work-tree=${HOME}' +local _tmp_config_alias='git --git-dir=${HOME}/.dotfiles --work-tree=${HOME}' if [[ "${HOST}" != "ventiloplattform" && -f ~/.ssh/noid_dotfiles ]]; then _tmp_config_alias="GIT_SSH_COMMAND=\"ssh -i ~/.ssh/noid_dotfiles\" ${_tmp_config_alias}" fi diff --git a/.local/bin/setup_dotfiles.sh b/.local/bin/setup_dotfiles.sh index 7646d0c..2040d4b 100755 --- a/.local/bin/setup_dotfiles.sh +++ b/.local/bin/setup_dotfiles.sh @@ -4,7 +4,7 @@ setopt LOCAL_OPTIONS ERR_RETURN NO_UNSET PIPE_FAIL local repo_address="https://schlomp.space/tastytea/dotfiles.git" -local tmp_git_command='git --git-dir=${HOME}/.dotfiles/ --work-tree=${HOME}' +local tmp_git_command='git --git-dir=${HOME}/.dotfiles --work-tree=${HOME}' if [[ -f ~/.ssh/noid_dotfiles ]]; then print -P "%F{12}Using dotfiles SSH-key%f" repo_address="git@schlomp.space:tastytea/dotfiles.git" @@ -17,6 +17,8 @@ alias config=${tmp_git_command} git clone --bare ${repo_address} ${HOME}/.dotfiles config config --local status.showUntrackedFiles no +config config --local core.worktree ${HOME} +config config core.bare false print -P "%F{12}Run%f" \ "%F{13}rm ${0} &&" \