[meta] More fixing up of osx and dotfiles roles

ansible/roles/bootstrap/tasks/main.yml

@@ -4,6 +4,7 @@
     recursive: yes
     dest: ~/.dotfiles
     force: no
+  ignore_errors: True
 - name: no-op so that sudo works in Homebrew later
   ping:
   sudo: True

ansible/roles/dotfiles/tasks/dotfiles.yml

@@ -5,5 +5,11 @@
     - ~/.ssh
 - file: src=~/.dotfiles/{{ item.key }} dest={{ item.value }} state=link
   with_dict: dotfiles
+- file:
+    src: ~/Dropbox/dotfiles/{{ item.key }}
+    dest: "{{ item.value }}"
+    state: link
+    force: yes # Since these won't exist until later.
+  with_dict: private
 - file: src=~/.dotfiles/.ssh/{{ item }} dest=~/.ssh/{{ item }} state=link
   with_lines: ls ~/.dotfiles/.ssh

ansible/roles/dotfiles/tasks/main.yml

@@ -1,6 +1,4 @@
 ---
 - include: dotfiles.yml
-  tags: dotfiles
 - include: powerline.yml
 - include: zsh.yml
-- include: ssh.yml

ansible/roles/dotfiles/tasks/powerline.yml

@@ -7,4 +7,6 @@
     - python
     - python-pip
   when: ansible_os_family == "Debian"
-- command: pip install --user --editable=~/.dotfiles/src/powerline
+- command: >
+    /usr/local/bin/pip install --user
+    --editable={{ ansible_env.HOME }}/.dotfiles/src/powerline

ansible/roles/dotfiles/tasks/ssh.yml

@@ -1,7 +0,0 @@
----
-- command: >
-    chdir={{ ansible_env.HOME }}/.dotfiles
-    stow --stow --target={{ ansible_env.HOME }} --no-folding ssh
-  tags: stow
-# - local_action: command ruby scripts/setup_ssh_keys.rb
-#   when: ansible_domain == "local"

ansible/roles/dotfiles/vars/main.yml

@@ -1,10 +1,8 @@
 dotfiles:
   gitignore: ~/.gitignore
   .bundle/config: ~/.bundle/config
-  .config: ~/.config
   .gemrc: ~/.gemrc
   .git_templates: ~/.git_templates
-  .gitconfig.private: ~/.gitconfig.private
   .gitconfig: ~/.gitconfig
   .hammerspoon: ~/.hammerspoon
   # .pentadactyl: ~/.pentadactyl
@@ -13,3 +11,6 @@ dotfiles:
   .tmux.conf: ~/.tmux.conf
   .vim: ~/.vim
   .vimrc: ~/.vimrc
+private:
+  .config: ~/.config
+  .gitconfig.private: ~/.gitconfig.private

ansible/roles/osx/tasks/main.yml

@@ -6,9 +6,10 @@
 - include: fonts.yml
 - include: defaults.yml
 
-- file: src=~/.dotfiles/osx/.tmux.conf.local dest=~/.tmux.conf.local state=link
-
-# - file: path=~/Library/KeyBindings state=directory
-# - copy: src=DefaultKeyBinding.dict dest=~/Library/KeyBindings/DefaultKeyBinding.dict
+- file: path=~/Library/KeyBindings state=directory
+- file:
+    src: ../osx/DefaultKeyBinding.dict
+    dest: ~/Library/KeyBindings/DefaultKeyBinding.dict
 
-# - command: open ~/.dotfiles/Alpha.terminal
+# TODO This should probably be moved to the dotfiles role.
+- file: src=~/.dotfiles/osx/.tmux.conf.local dest=~/.tmux.conf.local state=link