Change #1 after creating a branch. Change #2 in webui. Change #4 local. Nothing important. I did a regular pull and should try rebase next time.
test-webui-merge-2 1st change 2nd change, via webui 4th change to make it similar to last time...I just did a pull/rebase (without setting it as default and it worked without creating a merge commit.)
I'm learning a ton about dotfiles, command line use, Homebrew, zsh, git, and more with the course Dotfiles from Start to Finish-ish by @EIEIOxyz, and you can too!
Assuming you're not dealing with a theft or drive failure, do what you can to backup files and deactivate licenses.
Backup / sync everything:
- Time Machine
- Dropbox
- Google Drive
- etc.
Deactivate licenses:
- Dropbox (Preferences > Account > Unlink)
- ScreenFlow (Preferences > Licenses > Deactivate)
- iTunes, etc.
-
xcode-select --install. We need this forgit, among other things. -
git clone https://github.com/WhatsThatItsPat/dotfiles.git ~/.dotfiles. We'll start withhttpsbut switch tosshafter everything is installed. -
cd ~/.dotfiles -
source install -
Restart computer.
-
Install Dropbox, login, setup, and allow to sync. Alfred and Mackup (Terminal and VS Code) depend on this.
-
mackup restore, might want to do--dry-runfirst -
Generate ssh key, add to github, and switch remotes
# Generate SSH key in default location (~/.ssh/config) ssh-keygen -t rsa -b 4096 -C "764290+WhatsThatItsPat@users.noreply.github.com" # Start the ssh-agent eval "$(ssh-agent -s)" # Create config file with necessary settings << EOF > ~/.ssh/config Host * AddKeysToAgent yes UseKeychain yes IdentityFile ~/.ssh/id_rsa EOF # Add private key to ssh-agent ssh-add -K ~/.ssh/id_rsa # Copy public key and add to github.com > Settings > SSH and GPG keys pbcopy < ~/.ssh/id_rsa.pub # Test SSH connection, then verify fingerprint and username # https://help.github.com/en/github/authenticating-to-github/testing-your-ssh-connection ssh -T git@github.com # Switch from HTTPS to SSH git remote set-url origin git@github.com:WhatsThatItsPat/dotfiles.git
System Preferences > Keyboard > Shortcuts > Screenshotsand turn off the one forcmd+shift+4.- In app preferences, switch "take snap" from
cmd+shift+2(which conflicts with ScreenFlow) tocmd+shift+4.
System Preferences > Keyboard > Shortcuts > Spotlightand turn off the one forcmd+space.Alfred Preferences > Advanced > Set preferences folderand set to the one in Dropbox.
These will end up in macos_setup.zsh...leave for now:
defaults write com.googlecode.iterm2 LoadPrefsFromCustomFolder -bool true
defaults write com.googlecode.iterm2 PrefsCustomFolder -string "~/.dotfiles/iterm2"
defaults write com.googlecode.iterm2 NoSyncNeverRemindPrefsChangesLostForFile -bool trueno need to mention this...
Need to do mackup restore. Terminal overwrites the symlink, so we have to do manual backups (if we really care about it).
No need to mention this. It will end up in a setup file.
We will probably have to loop through extentions and use code --install-extension.