Change a lot of things

roles/bash/files/.bashrc

@@ -62,3 +62,5 @@ export BASH_SILENCE_DEPRECATION_WARNING=1
 # aliases
 
 # functions
+
+# imports

roles/docker/tasks/main.yml

@@ -1,19 +1,20 @@
 ---
-- name: Install docker and docker related stuff
+- name: Install docker and docker-compose stuff
+  when: ansible_distribution != 'MacOSX'
   ansible.builtin.package:
     name:
       - docker
       - docker-compose
     state: present
   become: "{{ become_root }}"
 
-- name: Create docker user group
+- name: Create docker user group on Linux
   when: ansible_distribution != 'MacOSX'
   ansible.builtin.group:
     name: docker
     state: present
 
-- name: Add the user to docker group
+- name: Add the user to docker group on Linux
   when: ansible_distribution != 'MacOSX'
   ansible.builtin.user:
     name: "{{ current_user }}"

roles/editors/meta/main.yml

@@ -1,3 +1,4 @@
 ---
 dependencies:
   - role: bash
+  - role: macos

roles/editors/tasks/neovim.yml

@@ -1,16 +1,37 @@
 ---
-- name: Install neovim
+- name: Install iterm2
+  when: ansible_distribution == 'MacOSX'
+  community.general.homebrew_cask:
+    name:
+      - iterm2
+    state: present
+
+- name: Install neovim on Linux
+  when: ansible_distribution != 'MacOSX'
   ansible.builtin.package:
     name: neovim
     state: present
   become: "{{ become_root }}"
 
-- name: Install silversearch when in OSX
+- name: Install neovim on MacOS
   when: ansible_distribution == 'MacOSX'
+  community.general.homebrew:
+    name: neovim
+    state: present
+  become: "{{ become_root }}"
+
+- name: Install silversearch on Linux
+  when: ansible_distribution != 'MacOSX'
   ansible.builtin.package:
     name: the_silver_searcher
     state: present
 
+- name: Install silversearch on OSX
+  when: ansible_distribution == 'MacOSX'
+  community.general.homebrew:
+    name: the_silver_searcher
+    state: present
+
 - name: Copy vim config
   ansible.builtin.copy:
     src: files/neovim/.vimrc

roles/git/files/git_functions.sh

@@ -3,7 +3,7 @@ function __git_arrows {
     git rev-parse --abbrev-ref @"{u}" &>/dev/null || return
     local branch_status
 
-    git rev-list --left-right --count HEAD...@"{u}" 2>/dev/null || return
+    git rev-list --left-right --count HEAD...@"{u}" 2>&1 1> /dev/null || return
     local left_arrow
     local right_arrow
 

roles/macos/files/homebrew.sh

@@ -0,0 +1 @@
+eval "$(/opt/homebrew/bin/brew shellenv)"

roles/macos/tasks/main.yml

@@ -0,0 +1,25 @@
+---
+- name: Install homebrew
+  when: ansible_distribution == 'MacOSX'
+  command: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+  args:
+      creates: /opt/homebrew/bin/brew
+
+- name: Add homebrew import
+  when: ansible_distribution == 'MacOSX'
+  ansible.builtin.blockinfile:
+    path: "{{ home_folder }}/.bashrc"
+    insertafter: '^# imports$'
+    marker: "# {mark} homebrew.sh"
+    block: "{{ lookup('file', 'files/homebrew.sh') }}"
+
+# - name: Install apps from brew-cask
+#   when: ansible_distribution == 'MacOSX'
+#   community.general.homebrew_cask:
+#     name:
+#       - firefox
+#       - google-chrome
+#       - password-gorilla
+#       - slack
+#       - spotify
+#     state: present

roles/terminal/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+  - role: macos