revert to stow based dotfile management
This commit is contained in:
parent
c90476f5f3
commit
3872df0fa7
|
|
@ -49,7 +49,7 @@ cmd lazygit ${{
|
|||
if git --noglob-pathspecs -C $dir status >/dev/null 2>&1; then
|
||||
lf -remote "send $id \$cd '$dir' && lazygit"
|
||||
else
|
||||
lazygit --git-dir "$XDG_DATA_HOME/dots" --work-tree "$HOME"
|
||||
lazygit --git-dir "$XDG_DATA_HOME/dots" -p "$STOW_DIR/$DOTS_PACKAGE"
|
||||
fi
|
||||
}}
|
||||
|
||||
|
|
|
|||
|
|
@ -53,11 +53,8 @@ zle -N edit-command-line
|
|||
|
||||
# Lazygit
|
||||
function lg() {
|
||||
if git --noglob-pathspecs -C $dir status >/dev/null 2>&1; then
|
||||
lf -remote "send $id \$cd '$dir' && lazygit"
|
||||
return
|
||||
fi
|
||||
lazygit --git-dir "$XDG_DATA_HOME/dots" --work-tree "$HOME"
|
||||
[ ! -d "$(pwd)/.git" ] && [[ $(read -erk "?Not in a git repository. Create a new git repository? (y/n): ") =~ ^[Yy]$ ]] && git init
|
||||
[ -d "$(pwd)/.git" ] && lazygit -p "$(pwd)"
|
||||
zle reset-prompt
|
||||
}
|
||||
zle -N lg
|
||||
|
|
|
|||
|
|
@ -6,114 +6,42 @@ GREEN="$(tput setaf 2)"
|
|||
BLUE="$(tput setaf 4)"
|
||||
NC="$(tput sgr0)"
|
||||
|
||||
target=$HOME
|
||||
gitdir=$target/.local/share/dots
|
||||
|
||||
mkdir -p "$(dirname "$gitdir")"
|
||||
|
||||
baregit() {
|
||||
git --git-dir="$gitdir" --work-tree="$target" "$@"
|
||||
dgit() {
|
||||
git -C "$STOW_DIR/$DOTS_PACKAGE" "$@"
|
||||
}
|
||||
|
||||
[ -e "$gitdir" ] || {
|
||||
printf "%b" "${BOLD}${BLUE}Cloning dotfiles...$NC\n"
|
||||
|
||||
git clone --bare git@git.snaile.de:luca/dotfiles "$gitdir"
|
||||
baregit checkout
|
||||
# baregit config status.showUntrackedFiles no
|
||||
|
||||
cd "$target" || exit
|
||||
for f in *; do
|
||||
[ "$f" = ".config" ] || [ "$f" = ".local" ] && {
|
||||
echo "$f" >>"$gitdir/info/exclude"
|
||||
rm -rf "$f"
|
||||
}
|
||||
done
|
||||
cd - || exit
|
||||
cat <<EOF >>"$gitdir/info/exclude"
|
||||
/*
|
||||
|
||||
!/\.config
|
||||
|
||||
!/\.local
|
||||
/\.local/share/dots
|
||||
/\.local/share/service
|
||||
EOF
|
||||
echo ".local/share/dots" >>"$gitdir/info/exclude"
|
||||
}
|
||||
printf "%b" "${BOLD}${BLUE}Removing dotfile symlinks...$NC\n\n"
|
||||
stow -D -d "$STOW_DIR" -t "$HOME" "$DOTS_PACKAGE" || printf "%b" "${RED}Failed to run stow!$NC\n"
|
||||
|
||||
printf "%b" "${BOLD}${BLUE}Stashing existing changes...$NC\n"
|
||||
stash_result=$(baregit stash push)
|
||||
stash_result=$(dgit stash push)
|
||||
needs_pop=1
|
||||
if [ "$stash_result" = "No local changes to save" ]; then
|
||||
needs_pop=0
|
||||
needs_pop=0
|
||||
fi
|
||||
printf "\n"
|
||||
|
||||
printf "%b" "${BOLD}${BLUE}Pulling updates from dotfiles repo...$NC\n"
|
||||
old_commit="$(baregit rev-parse HEAD)"
|
||||
baregit pull origin main
|
||||
baregit submodule update --remote --merge
|
||||
old_commit="$(dgit rev-parse HEAD)"
|
||||
dgit pull origin main
|
||||
dgit submodule update --remote --merge
|
||||
printf "\n"
|
||||
|
||||
if [ $needs_pop -eq 1 ]; then
|
||||
printf "%b" "${BOLD}${BLUE}Popping stashed changes...$NC\n"
|
||||
baregit stash pop
|
||||
printf "%b" "${BOLD}${BLUE}Popping stashed changes...$NC\n"
|
||||
dgit stash pop
|
||||
fi
|
||||
printf "\n"
|
||||
|
||||
unmerged_files=$(baregit diff --name-only --diff-filter=U)
|
||||
unmerged_files=$(dgit diff --name-only --diff-filter=U)
|
||||
if [ -n "$unmerged_files" ]; then
|
||||
printf "%b" "${RED}The following files have merge conflicts after popping the stash:$NC\n\n"
|
||||
printf "%s" "$unmerged_files\n\n"
|
||||
printf "%s" "${BOLD}${BLUE}Reverting to previous commit...$NC"
|
||||
baregit checkout "$old_commit"
|
||||
printf "%b" "${RED}The following files have merge conflicts after popping the stash:$NC\n\n"
|
||||
printf "%s" "$unmerged_files\n\n"
|
||||
printf "%s" "${BOLD}${BLUE}Reverting to previous commit...$NC"
|
||||
dgit checkout "$old_commit"
|
||||
fi
|
||||
|
||||
printf "%b" "${BOLD}${GREEN}Dotfiles synced successfully!$NC\n"
|
||||
printf "%b" "${BOLD}${BLUE}Symlinking dotfiles...$NC\n\n"
|
||||
stow -d "$STOW_DIR" -t "$HOME" "$DOTS_PACKAGE" || printf "%b" "${RED}Failed to run stow!$NC\n"
|
||||
|
||||
# BOLD="$(tput bold)"
|
||||
# RED="$(tput setaf 1)"
|
||||
# GREEN="$(tput setaf 2)"
|
||||
# BLUE="$(tput setaf 4)"
|
||||
# NC="$(tput sgr0)"
|
||||
#
|
||||
# dgit() {
|
||||
# git -C "$STOW_DIR/$DOTS_PACKAGE" "$@"
|
||||
# }
|
||||
#
|
||||
# printf "%b" "${BOLD}${BLUE}Removing dotfile symlinks...$NC\n\n"
|
||||
# stow -D -d "$STOW_DIR" -t "$HOME" "$DOTS_PACKAGE" || printf "%b" "${RED}Failed to run stow!$NC\n"
|
||||
#
|
||||
# printf "%b" "${BOLD}${BLUE}Stashing existing changes...$NC\n"
|
||||
# stash_result=$(dgit stash push)
|
||||
# needs_pop=1
|
||||
# if [ "$stash_result" = "No local changes to save" ]; then
|
||||
# needs_pop=0
|
||||
# fi
|
||||
# printf "\n"
|
||||
#
|
||||
# printf "%b" "${BOLD}${BLUE}Pulling updates from dotfiles repo...$NC\n"
|
||||
# old_commit="$(dgit rev-parse HEAD)"
|
||||
# dgit pull origin main
|
||||
# dgit submodule update --remote --merge
|
||||
# printf "\n"
|
||||
#
|
||||
# if [ $needs_pop -eq 1 ]; then
|
||||
# printf "%b" "${BOLD}${BLUE}Popping stashed changes...$NC\n"
|
||||
# dgit stash pop
|
||||
# fi
|
||||
# printf "\n"
|
||||
#
|
||||
# unmerged_files=$(dgit diff --name-only --diff-filter=U)
|
||||
# if [ -n "$unmerged_files" ]; then
|
||||
# printf "%b" "${RED}The following files have merge conflicts after popping the stash:$NC\n\n"
|
||||
# printf "%s" "$unmerged_files\n\n"
|
||||
# printf "%s" "${BOLD}${BLUE}Reverting to previous commit...$NC"
|
||||
# dgit checkout "$old_commit"
|
||||
# fi
|
||||
#
|
||||
# printf "%b" "${BOLD}${BLUE}Symlinking dotfiles...$NC\n\n"
|
||||
# stow -d "$STOW_DIR" -t "$HOME" "$DOTS_PACKAGE" || printf "%b" "${RED}Failed to run stow!$NC\n"
|
||||
#
|
||||
# printf "%b" "${BOLD}${GREEN}Dotfiles synced successfully!$NC\n"
|
||||
printf "%b" "${BOLD}${GREEN}Dotfiles synced successfully!$NC\n"
|
||||
|
|
|
|||
Loading…
Reference in New Issue