wip

playbook.yml

@@ -7,7 +7,7 @@
 
 - hosts: os_MacOSX
   roles:
-    - geerlingguy.homebrew
+    - geerlingguy.mac.homebrew
 
 - hosts: localhost
   vars:
@@ -16,17 +16,12 @@
   roles:
     - base
     - zsh
+    - iterm2
     - tmux
     - nvim
+    - vscode
     - fzf
     - docker
     - virtualbox
-    - java
-    - intellij_ce
     - javascript
-    - python
-    - aws
-    - kubernetes
-    - dbeaver
     - spotify
-    - redis

requirements.yml

@@ -1,3 +1,4 @@
 ---
-- src: geerlingguy.homebrew
-  version: 3.1.0
+collections:
+  - name: geerlingguy.mac
+    version: 2.1.1 

roles/javascript/tasks/main.yml

@@ -15,7 +15,6 @@
     curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/{{ uri_res.json[0].name }}/install.sh | bash
   args:
     creates: "{{ ansible_env.HOME }}/.nvm/nvm.sh"
-    warn: false
 
 - name: install latest version of node
   shell: 'export NVM_DIR="{{ ansible_env.HOME }}/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && nvm install node'

roles/zsh/tasks/main.yml

@@ -1,7 +1,5 @@
 ---
-- name: install zsh (macos)
-  homebrew: name=zsh state=present update_homebrew=yes
-  when: ansible_distribution == "MacOSX"
+# just going to assume any new mac is Ventura or greater, which has zsh as the default shell
 
 - name: install zsh
   apt: name=zsh update_cache=yes
@@ -13,6 +11,7 @@
     name: "{{ ansible_env.USER }}"
     shell: /bin/zsh
   become: yes
+  when: ansible_distribution == "Ubuntu"
 
 - name: install oh-my-zsh
   git:
@@ -28,5 +27,4 @@
     src: files/zshrc
     dest: "{{ ansible_env.HOME }}/.zshrc"
     owner: "{{ ansible_env.USER }}"
-    group: "{{ ansible_env.USER }}"
     mode: 0644