clean up old mac provisioning

README.md

@@ -33,16 +33,15 @@ Generally:
 git clone https://github.com/davidosomething/dotfiles ~/.dotfiles
 ```
 
-Then, run the [bootstrap/symlink](./bootstrap/symlink) script for linux or
-[bootstrap/mac](./bootstrap/mac) for macOS.
+Then, run the [bootstrap/symlink](./bootstrap/symlink) script.
 
-After symlinking, [bootstrap/cleanup](./bootstrap/cleanup) can move dotfiles
-into their XDG Base Directory supported directories and deletes unnecessary
-things (with confirmation).
-
-After symlinking and restarting shell, aliases will be available.
+After symlinking, **restart the shell**. Aliases will be available.
 The `sshkeygen` alias will help in generating a new SSH key.
 
+Run [bootstrap/cleanup](./bootstrap/cleanup) to clean up stray dotfiles, moving
+into their XDG Base Directory supported directories and deleting unnecessary
+things (with confirmation).
+
 ## Updating
 
 `u` is an alias to [dot](./bin/dot). Use `u` without arguments for usage.

mac/Brewfile

@@ -1,37 +1,9 @@
-tap "homebrew/bundle"
-tap "homebrew/cask-fonts"
-tap "homebrew/services"
-brew "aspell"
-brew "catimg"
-brew "checkbashisms"
-brew "checkstyle"
-brew "coreutils"
-brew "xz"
-brew "curl"
-brew "findutils"
-brew "fzf"
-brew "git"
-brew "readline"
-brew "sqlite"
 brew "mackup"
 brew "mas"
 brew "moreutils"
 brew "neovim"
-brew "nmap"
-brew "openssl@3"
-brew "rsync"
-brew "shellcheck"
-brew "switchaudio-osx"
-brew "teleport"
-brew "trash-cli"
-brew "tree"
-brew "wget"
-brew "zlib"
-brew "zsh"
 cask "bettertouchtool"
 cask "firefox"
-cask "font-fira-mono-nerd-font"
+cask "google-chrome"
 cask "hammerspoon"
-cask "slack"
-mas "EasyRes", id: 688211836
-mas "Xcode", id: 497799835
+cask "wezterm"

mac/README.md

@@ -1,73 +1,59 @@
-# macOS/OS X
+# macOS
 
 User data on encrypted volumes other than the boot volume will not mount until
 login. To remedy this, see [Unlock] (forked to my GitHub for archival).
 
-## Disable some keyboard shortcuts
-
-Remove these using System Preferences:
-
-- `Mission Control` owns <kbd>⌃</kbd><kbd>←</kbd> and <kbd>⌃</kbd><kbd>→</kbd>
-- `Spotlight` owns <kbd>⌘</kbd><kbd>space</kbd>
-
-## Reduce desktop icon size
-
-Click desktop to focus Finder, <kbd>⌘</kbd><kbd>j</kbd> use smallest sizes for
-everything.
-
 ## App store
 
 1. iCloud sign in
-1. Install App store apps
-
-   - [Display Menu] or EasyRes: Set higher/native resolutions
-   - [Xcode]: select CLI tools in prefs
-     - This is **required** to build some apps like neovim@HEAD
+1. Install App store apps, XCode
 
-## Setup ssh keys
+## Install homebrew and bootstrap
 
-1. `sshkeygen` (alias to generate new ed25519 keys)
-1. Add the public key to GitHub, GitLab, Bitbucket, etc.
-1. `ssh-add -K ~/.ssh/privatekeyfile` to store the key in Keychain.
+Install homebrew according to <https://brew.sh/>.
 
 ## Install dotfiles
 
 ```sh
 git clone https://github.com/davidosomething/dotfiles.git ~/.dotfiles/
+cd ~/.dotfiles
+./bootstrap/symlink
+# restart terminal
 ```
 
-## Install homebrew and bootstrap
+## Setup ssh keys
 
-Install homebrew according to <https://brew.sh/>.
+1. `sshkeygen` (alias to generate new ed25519 keys)
+1. Add the public key to GitHub, GitLab, Bitbucket, etc.
+1. `ssh-add -K ~/.ssh/privatekeyfile` to store the key in Keychain.
+1. Optionally change the `~/.dotfiles` origin protocol to SSH
 
-Mojave no longer installs SDK headers for building certain things. It comes
-with mac OS but requires manual execution. Use
-[bootstrap/mac](../bootstrap/mac) to install it:
+## Brew
 
 ```sh
-~/.dotfiles/bootstrap/mac
+cd ~/.dotfiles/mac
+brew bundle
 ```
 
-The script will also:
+This installs some packages I would use on every mac, whether it's a personal
+or work machine. For personal machines I also install:
 
-- `brew bundle` some default packages
-- Run the fzf installer
-- Change the user's default shell to the brewed `zsh`
+- bitwarden
+- discord
+- notion-calendar
+- standard-notes
+- syncthing
+- tailscale
 
 Bundle dumps for specific systems are in my `~/.secret` (not public).
 
 ## Cask notes
 
-- dropbox
-  - Has app settings sync so wait for it to finish syncing.
-  - If the shared directory is on an external volume, disable autostart and
-    add [LoginItems/DelayedDropbox.app](LoginItems/DelayedDropbox.app) to
-    your login items instead. It is a generic app made using Script Editor.
 - bettertouchtool
-  - License in gmail
+  - I keep my license in syncthing/gmail/bitwarden
+  - Most important thing is three-finger click to middle click
   - Provides better trackpad swipe configs, drag window snapping,
     modifier-hold window resizing
-  - Synced to Dropbox
 - hammerspoon
   - App launcher (<kbd>⌘</kbd><kbd>space</kbd>) to replace spotlight
     (disable spotlight shortcut first)
@@ -93,17 +79,12 @@ system this is a symlink to a private settings repository.
 
 Run `mackup restore` to restore settings from that repository.
 
-## Install development tools
+## Manually disable some keyboard shortcuts
 
-Installed packages before development tools.  
-Use the `bi` alias for a clean room install.
+Remove these using System Preferences:
 
-- Increase file limits a la
-  <https://github.com/karma-runner/karma/issues/1979#issuecomment-260790451>
-  - See <https://gist.github.com/abernix/a7619b07b687bb97ab573b0dc30928a0>
-    if there are still file limit issues
-  - REBOOT for `ulimit -n` changes to take effect
+- `Mission Control` owns <kbd>⌃</kbd><kbd>←</kbd> and <kbd>⌃</kbd><kbd>→</kbd>
+- `Spotlight` owns <kbd>⌘</kbd><kbd>space</kbd>
+  - I map this to hammerspoon's seal instead.
 
 [unlock]: https://github.com/davidosomething/Unlock
-[Display Menu]: https://apps.apple.com/us/app/display-menu/id549083868?mt=12
-[Xcode]: https://apps.apple.com/us/app/xcode/id497799835?mt=12