diff --git a/Makefile b/Makefile index 0578a34..0264a71 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,6 @@ default: @echo "Cowardly refusing to run on $(shell uname). Use platform specific targets." -macos-setup: link-dotfiles link-karabiner macos - osascript -e 'tell app "loginwindow" to «event aevtrrst»' - -init-post-reboot: asdf link-sublime restore-preferences disable-restore-apps-on-login - brew-install: /bin/bash -c "$$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" @@ -14,13 +9,14 @@ brew-bundle: brew update brew bundle +macos: + sh .macos + osascript -e 'tell app "loginwindow" to «event aevtrrst»' + macos-reset-dock: defaults write com.apple.dock persistent-apps -array killall Dock -macos: - sh .macos - link-dotfiles: mkdir -p $$HOME/.local ./link-dotfiles.sh diff --git a/README.md b/README.md index fff736f..e6813fb 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,18 @@ cd .dotfiles make brew-install make brew-bundle -make macos-setup + +# set modern bash as the default shell +(($(grep bash /etc/shells | wc -l)<2)) && which -a bash | head -n1 | sudo tee -a /etc/shells +chsh -l $(which -a bash | head -n1) + +make link-dotfiles +make link-karabiner +make restore-preferences + +make macos-reset-dock +make macos-disable-restore-apps-on-login +make macos ``` ## GNU/Linux @@ -25,6 +36,7 @@ make macos-setup git clone git@github.com:nonrational/dotfiles .dotfiles cd .dotfiles + make link-dotfiles ```