From 372db1aa4384bff6565c4b6975dbefd34c762f41 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Wed, 2 Nov 2022 05:04:18 +0000 Subject: [PATCH] Update dotfiles/.local/bin/install-dotfiles, dotfiles/.gitconfig --- dotfiles/.gitconfig | 3 +++ dotfiles/.local/bin/install-dotfiles | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig index 9be6f05f..0dbe748f 100644 --- a/dotfiles/.gitconfig +++ b/dotfiles/.gitconfig @@ -1,3 +1,5 @@ +[advice] + detachedHead = false [alias] c = commit ca = commit -a @@ -49,6 +51,7 @@ [user] email = name = +# https://git-scm.com/book/en/v2/Git-Internals-Environment-Variables # name = {{ user.git_user_name | default('') }} # email = {{ user.git_user_email | default('') }} [web] diff --git a/dotfiles/.local/bin/install-dotfiles b/dotfiles/.local/bin/install-dotfiles index 911456e4..277ff9a6 100644 --- a/dotfiles/.local/bin/install-dotfiles +++ b/dotfiles/.local/bin/install-dotfiles @@ -3,7 +3,7 @@ if [ -f '/etc/qubes-release' ]; then # Qubes dom0 qvm-create --label red --template debian-11 provision &> /dev/null || EXIT_CODE=$? - qvm-run --pass-io provision 'if [ -d ~/Downloads/professor-dotfiles ]; then cd ~/Downloads/professor-dotfiles && git config pull.rebase false && rm -rf dotfiles/.local/asdf && git pull origin master && git clone https://github.com/asdf-vm/asdf.git dotfiles/.local/asdf --branch v0.10.2; else git clone https://gitlab.com/megabyte-labs/dotfiles.git ~/Downloads/professor-dotfiles; git clone https://github.com/asdf-vm/asdf.git ~/Downloads/professor-dotfiles/dotfiles/.local/asdf --branch v0.10.2; fi; cd ~/Downloads; tar -zcvf /tmp/professor-dotfiles.tar.gz professor-dotfiles' + qvm-run --pass-io provision 'if [ -d ~/Downloads/professor-dotfiles ]; then cd ~/Downloads/professor-dotfiles && git config pull.rebase false && rm -rf dotfiles/.local/asdf && git pull origin master && git clone https://github.com/asdf-vm/asdf.git dotfiles/.local/asdf --branch v0.10.2; else git clone https://gitlab.com/megabyte-labs/dotfiles.git ~/Downloads/professor-dotfiles; cd ~/Downloads/professor-dotfiles/dotfiles/.local && git clone https://github.com/asdf-vm/asdf.git asdf --branch v0.10.2; fi; cd ~/Downloads; tar -zcvf /tmp/professor-dotfiles.tar.gz professor-dotfiles' qvm-run --pass-io provision "cat /tmp/professor-dotfiles.tar.gz" > "/tmp/dotfiles.tar.gz" tar -xzf "/tmp/dotfiles.tar.gz" -C "$HOME" rm -f "/tmp/dotfiles.tar.gz"