diff --git a/.gitmodules b/.gitmodules index 82fcfb2..68e1f4f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "src/prezto"] path = src/prezto - url = git@github.com:kejadlen/prezto.git + url = https://github.com/kejadlen/prezto.git [submodule "Alfred.alfredpreferences/workflows/faker.alfredworkflow"] path = Alfred.alfredpreferences/workflows/faker.alfredworkflow - url = git@github.com:kejadlen/faker.alfredworkflow + url = https://github.com/kejadlen/faker.alfredworkflow [submodule "Alfred.alfredpreferences/workflows/alphred.alfredworkflow"] path = Alfred.alfredpreferences/workflows/alphred.alfredworkflow - url = git@github.com:kejadlen/alphred.alfredworkflow.git + url = https://github.com/kejadlen/alphred.alfredworkflow.git [submodule ".vim/pack/alpha/start/vim-commentary"] path = .vim/pack/alpha/start/vim-commentary url = https://github.com/tpope/vim-commentary.git @@ -72,13 +72,13 @@ url = https://github.com/ElmCast/elm-vim.git [submodule "src/giphy.alfredworkflow"] path = src/giphy.alfredworkflow - url = git@github.com:kejadlen/giphy.alfredworkflow.git + url = https://github.com/kejadlen/giphy.alfredworkflow.git [submodule ".vim/pack/alpha/start/vim-racket"] path = .vim/pack/alpha/start/vim-racket url = https://github.com/wlangstroth/vim-racket.git [submodule "src/dark-sky.alfredworkflow"] path = src/dark-sky.alfredworkflow - url = git@github.com:kejadlen/dark-sky.alfredworkflow.git + url = https://github.com/kejadlen/dark-sky.alfredworkflow.git [submodule ".vim/pack/alpha/start/lightline.vim"] path = .vim/pack/alpha/start/lightline.vim url = https://github.com/itchyny/lightline.vim.git @@ -108,7 +108,7 @@ url = https://github.com/kana/vim-operator-user.git [submodule "src/emoji.alfredworkflow"] path = src/emoji.alfredworkflow - url = git@github.com:kejadlen/emoji.alfredworkflow.git + url = https://github.com/kejadlen/emoji.alfredworkflow.git [submodule ".vim/pack/alpha/start/vim-colors-paramount"] path = .vim/pack/alpha/start/vim-colors-paramount url = https://github.com/owickstrom/vim-colors-paramount.git diff --git a/Brewfile b/Brewfile deleted file mode 100644 index 1e21011..0000000 --- a/Brewfile +++ /dev/null @@ -1,62 +0,0 @@ -tap "crisidev/chunkwm" -tap "homebrew/bundle" -tap "homebrew/cask" -tap "homebrew/cask-drivers" -tap "homebrew/cask-fonts" -tap "homebrew/cask-versions" -tap "homebrew/core" -tap "homebrew/services" -tap "kejadlen/personal" -tap "seattle-beach/tap" -brew "ansible" -brew "chruby" -brew "ctags" -brew "direnv" -brew "exa" -brew "fasd" -brew "fzf" -brew "git" -brew "hledger" -brew "macvim", args: ["with-override-system-vim"] -brew "mas" -brew "mosh" -brew "onepass" -brew "reattach-to-user-namespace" -brew "ripgrep" -brew "ruby-install" -brew "tmux" -brew "tree" -brew "youtube-dl" -brew "zsh" -brew "crisidev/chunkwm/chunkwm" -cask "1password" -cask "acorn" -cask "alfred" -cask "arq" -cask "bartender" -cask "daisydisk" -cask "dash" -cask "dropbox" -cask "encryptme" -cask "fantastical" -cask "firefoxdeveloperedition" -cask "google-chrome" -cask "hammerspoon" -cask "night-owl" -cask "qlmarkdown" -cask "qlstephen" -cask "quicklook-csv" -cask "quicklook-json" -cask "resilio-sync" -cask "slack" -cask "vlc" -cask "zoomus" -cask "homebrew/cask-drivers/logitech-options" -cask "homebrew/cask-fonts/font-fira-mono-for-powerline" -cask "homebrew/cask-fonts/font-hack" -cask "homebrew/cask-fonts/font-source-code-pro-for-powerline" -mas "iPulse", id: 1028916583 -mas "Paprika Recipe Manager", id: 451907568 -mas "Reeder", id: 880001334 -mas "Things3", id: 904280696 -mas "Todoist", id: 585829637 diff --git a/README.md b/README.md index cf86b93..2dada3d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ This repo contains both my dotfiles as well as [Ansible][ansible] playbooks to provision new machines. -**Use at your own risk.** Untested except on my own El Capitan installs. +**Use at your own risk.** [ansible]: https://github.com/ansible/ansible @@ -19,13 +19,15 @@ provision new machines. First, some steps need to be performed on the remote machine that I couldn't figure out how to automate: -- Enable Remote Login in System Preferences -> Sharing. -- Install the command line developer tools: `xcode-select --install`. (It looks -like the Homebrew installer [_should_][xcode-select-cli] be able to handle -this, but I haven't been able to get it to work headless.) -- Install [Xcode](https://itunes.apple.com/us/app/xcode/id497799835?mt=12): `open 'https://itunes.apple.com/us/app/xcode/id497799835?mt=12'` -- Accept the Xcode license: `sudo xcodebuild -license` +- [ ] Enable Remote Login in System Preferences -> Sharing. +- [ ] Install [Xcode][xcode]: `open 'https://itunes.apple.com/us/app/xcode/id497799835?mt=12'` +- [ ] Accept the Xcode license: `sudo xcodebuild -license` +- [ ] Open Xcode +- [ ] Install the command line developer tools: `xcode-select --install`. (It looks like the + Homebrew installer [_should_][xcode-select-cli] be able to handle this, but I haven't been able to + get it to work headless.) +[xcode]: https://itunes.apple.com/us/app/xcode/id497799835?mt=12 [xcode-select-cli]: https://github.com/Homebrew/install/blob/master/install#L207-L216 On the control machine: @@ -45,9 +47,6 @@ A couple items that I haven't gotten around to automating yet that need to be manually run post-provisioning: ``` shell -# Apply personal Terminal settings -open ~/.dotfiles/Alpha.terminal - # Symlink ~/.dotfiles to Dropbox rm -rf ~/.dotfiles ln -s ~/Dropbox/dotfiles ~/.dotfiles diff --git a/ansible/main.yml b/ansible/main.yml index 40caa13..24ef6d3 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -12,19 +12,14 @@ dest: ~/.dotfiles ignore_errors: yes -- hosts: os_MacOSX - tasks: - - name: update homebrew - homebrew: update_homebrew=yes +- import_playbook: playbooks/homebrew.yml - hosts: os_MacOSX roles: - - role: homebrew - role: osx - hosts: all roles: - dotfiles - ruby - - powerline - zsh diff --git a/ansible/playbooks/homebrew.yml b/ansible/playbooks/homebrew.yml new file mode 100644 index 0000000..3e6d25d --- /dev/null +++ b/ansible/playbooks/homebrew.yml @@ -0,0 +1,92 @@ +- hosts: os_MacOSX + tasks: + - name: update + homebrew: update_homebrew=yes + + - name: install taps + homebrew_tap: + name: + - crisidev/chunkwm + - homebrew/bundle + - homebrew/cask + - homebrew/cask-drivers + - homebrew/cask-fonts + - homebrew/cask-versions + - homebrew/core + - homebrew/services + - kejadlen/personal + - seattle-beach/tap + + - name: install formulae + homebrew: + name: + - ansible + - chruby + - ctags + - direnv + - exa + - fasd + - fzf + - git + - hledger + - jq + - mas + - mosh + - reattach-to-user-namespace + - ripgrep + - ruby-install + - tmux + - tree + - youtube-dl + - zsh + - crisidev/chunkwm/chunkwm + + - name: install macvim + homebrew: + name: macvim + install_options: with-override-system-vim + + # Not sure if this is needed anymore - was used for installing casks + - name: authenticate sudo + ping: + become: yes + + - name: install casks + homebrew_cask: + name: + - 1password + - 1password-cli + - acorn + - alfred + - arq + - bartender + - daisydisk + - dash + - dropbox + - encryptme + - fantastical + - firefox-developer-edition + - google-chrome + - hammerspoon + - night-owl + - qlmarkdown + - qlstephen + - quicklook-csv + - quicklook-json + - resilio-sync + - slack + - vlc + - zoomus + - homebrew/cask-drivers/logitech-options + - homebrew/cask-fonts/font-fira-mono-for-powerline + - homebrew/cask-fonts/font-hack + - homebrew/cask-fonts/font-source-code-pro-for-powerline + + - name: install from app store + command: /usr/local/bin/mas install {{ item }} + with_items: + - 1028916583 # iPulse + - 451907568 # Paprika Recipe Manager + - 880001334 # Reeder + - 904280696 # Things3 + - 585829637 # Todoist diff --git a/ansible/roles/homebrew/tasks/main.yml b/ansible/roles/homebrew/tasks/main.yml deleted file mode 100644 index 4fd9979..0000000 --- a/ansible/roles/homebrew/tasks/main.yml +++ /dev/null @@ -1,12 +0,0 @@ -- name: install homebrew-bundle - command: brew tap Homebrew/bundle - -# Not sure if this is needed anymore - was used for installing casks -- name: authenticate sudo - ping: - become: yes - -- name: homebrew-bundle install - command: brew bundle - args: - chdir: ~/.dotfiles