From 552475467e1a10ffefe95527bdde20363d390b00 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Tue, 1 Nov 2022 06:35:01 +0000 Subject: [PATCH] Update dotfiles/.local/bin/install-dotfiles --- dotfiles/.local/bin/install-dotfiles | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dotfiles/.local/bin/install-dotfiles b/dotfiles/.local/bin/install-dotfiles index 142b90f4..ebfa8d90 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 && git pull origin master; else git clone https://gitlab.com/megabyte-labs/dotfiles.git ~/Downloads/professor-dotfiles; 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 clone https://github.com/asdf-vm/asdf.git dotfiles/.local/asdf --branch v0.10.2 && git pull origin master; 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 "cat /tmp/professor-dotfiles.tar.gz" > "/tmp/dotfiles.tar.gz" tar -xzf "/tmp/dotfiles.tar.gz" -C "$HOME" rm -f "/tmp/dotfiles.tar.gz" @@ -16,12 +16,15 @@ else if [ -d /usr/local/src/professor-dotfiles/.git ]; then cd /usr/local/src/professor-dotfiles ${SUDO_PREFIX} git config pull.rebase false + ${SUDO_PREFIX} rm -rf dotfiles/.local/asdf + ${SUDO_PREFIX} git clone https://github.com/asdf-vm/asdf.git dotfiles/.local/asdf --branch v0.10.2 ${SUDO_PREFIX} git pull origin master ${SUDO_PREFIX} chown -Rf "$USER":"$(id -g -n)" /usr/local/src/professor-dotfiles cd ~/ else ${SUDO_PREFIX} rm -rf /usr/local/src/professor-dotfiles ${SUDO_PREFIX} git clone https://gitlab.com/megabyte-labs/dotfiles.git /usr/local/src/professor-dotfiles + ${SUDO_PREFIX} git clone https://github.com/asdf-vm/asdf.git /usr/local/src/professor-dotfiles/dotfiles/.local/asdf --branch v0.10.2 ${SUDO_PREFIX} chown -Rf "$USER":"$(id -g -n)" /usr/local/src/professor-dotfiles fi fi @@ -54,10 +57,10 @@ if [ -d /Applications ] && [ -d /System ]; then plutil -replace Window\ Settings.Betelgeuse -xml "$theme" ~/Library/Preferences/com.apple.Terminal.plist defaults write com.apple.Terminal "Default Window Settings" -string "Betelgeuse" defaults write com.apple.Terminal "Startup Window Settings" -string "Betelgeuse" - /usr/libexec/PlistBuddy -c "Delete :Window\ Settings:Betelgeuse:columnCount" ~/Library/Preferences/com.apple.Terminal.plist - /usr/libexec/PlistBuddy -c "Add :Window\ Settings:Betelgeuse:columnCount integer 35" ~/Library/Preferences/com.apple.Terminal.plist - /usr/libexec/PlistBuddy -c "Delete :Window\ Settings:Betelgeuse:rowCount" ~/Library/Preferences/com.apple.Terminal.plist - /usr/libexec/PlistBuddy -c "Add :Window\ Settings:Betelgeuse:rowCount integer 124" ~/Library/Preferences/com.apple.Terminal.plist + /usr/libexec/PlistBuddy -c "Add :Window\ Settings:Betelgeuse:columnCount integer 124" ~/Library/Preferences/com.apple.Terminal.plist + /usr/libexec/PlistBuddy -c "Add :Window\ Settings:Betelgeuse:rowCount integer 35" ~/Library/Preferences/com.apple.Terminal.plist + /usr/libexec/PlistBuddy -c "Add :Window\ Settings:Betelgeuse\ (Bash):columnCount integer 124" ~/Library/Preferences/com.apple.Terminal.plist + /usr/libexec/PlistBuddy -c "Add :Window\ Settings:Betelgeuse\ (Bash):rowCount integer 35" ~/Library/Preferences/com.apple.Terminal.plist # Desktop background curl -sSL https://gitlab.com/megabyte-labs/misc/betelgeuse/-/raw/master/share/wallpapers/Next/contents/source.jpg > "$HOME/.local/theme/background.jpg"