update repository

.gitignore

@@ -1,5 +1,6 @@
 # ---> Ansible
 *.retry
+collections
 roles
 
 # ---> Vim

.gitmodules

@@ -0,0 +1,21 @@
+[submodule "roles/ansible-git"]
+	path = roles/ansible-git
+	url = https://github.com/MayNiklas/ansible-git.git
+[submodule "roles/ansible-yubikey"]
+	path = roles/ansible-yubikey
+	url = https://github.com/MayNiklas/ansible-yubikey-mac.git
+[submodule "roles/ansible-ssh"]
+	path = roles/ansible-ssh
+	url = https://github.com/MayNiklas/ansible-ssh.git
+[submodule "roles/ansible-osx_defaults"]
+	path = roles/ansible-osx_defaults
+	url = https://github.com/MayNiklas/ansible-osx_defaults.git
+[submodule "roles/ansible-homebrew"]
+	path = roles/ansible-homebrew
+	url = https://github.com/MayNiklas/ansible-homebrew.git
+[submodule "roles/ansible-mas"]
+	path = roles/ansible-mas
+	url = https://github.com/MayNiklas/ansible-mas.git
+[submodule "roles/ansible-shell-mac"]
+	path = roles/ansible-shell-mac
+	url = https://github.com/MayNiklas/ansible-shell-mac.git

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "redhat.ansible"
+    ]
+}

README.md

@@ -3,24 +3,34 @@
 [![Lines Of Code](https://tokei.rs/b1/github/MayNiklas/ansible-mac?category=code)](https://github.com/XAMPPRocky/tokei)
 [![Lines Of Code](https://tokei.rs/b1/github/MayNiklas/ansible-mac?category=files)](https://github.com/XAMPPRocky/tokei)
 
-### Installing brew
+### Used roles:
+- https://github.com/MayNiklas/ansible-osx_defaults.git
+- https://github.com/MayNiklas/ansible-shell-mac.git
+- https://github.com/MayNiklas/ansible-git.git
+- https://github.com/MayNiklas/ansible-yubikey-mac.git
+- https://github.com/MayNiklas/ansible-homebrew.git
+- https://github.com/MayNiklas/ansible-ssh.git
+- https://github.com/MayNiklas/ansible-mas.git
+
+### how to execute the playbook
 ```bash
+# install brew.sh
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
-```
 
-### Installing Ansible
-```bash
+# clone repository
+git clone --recursive https://github.com/MayNiklas/ansible-mac.git
+
+# install ansible
 brew install ansible
-```
-### Configure the variables to your liking
-```
-cp default.config.yml config.yml
-nano config.yml
-```
 
-### Executing playbook
-```bash
-ansible-playbook main.yml
+# Configure the variables to your liking
+nano host_vars/localhost.yml
+
+# Install required roles
+ansible-galaxy install -r requirements.yml
+
+# execute playbook
+ansible-playbook site.yml
 ```
 
 Preperation:

ansible.cfg

@@ -1,6 +1,7 @@
 [defaults]
 nocows = True
-roles_path = ./roles:/etc/ansible/roles
+roles_path = ./roles:~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
+collections_paths = ./collections:~/.ansible/collections:/usr/share/ansible/collections
 inventory = ./inventory.yml
 
 [privilege_escalation]

host_vars/localhost.yml

@@ -0,0 +1,68 @@
+---
+
+configure_osx: true
+
+configure_yubikey: true
+
+configure_shell: true
+
+configure_ssh: false
+ssh_path: ~/.ssh/id_rsa
+ssh_size: 4096
+ssh_comment: macbook
+
+configure_git: yes
+git_mail: info@niklas-steffen.de
+git_name: MayNiklas
+
+configure_brew: true
+homebrew_taps:
+  - homebrew/core
+  - homebrew/cask
+  - homebrew/cask-drivers
+  - drone/drone
+
+homebrew_apps:
+  - adobe-creative-cloud
+  - discord
+  - docker
+  - element
+  - firefox
+  - github
+  - jetbrains-toolbox
+  - monitorcontrol
+  - plex
+  - signal
+  - spotify
+  - sublime-text
+  - telegram
+  - vlc
+  - visual-studio-code
+  - yubico-authenticator
+  - zoom
+
+homebrew_packages:
+  - ansible
+  - asciinema
+  - docker-compose
+  - git
+  - hugo
+  - iperf3
+  - mas
+  - nmap
+  - wakeonlan
+  - wget
+
+configure_mas: true
+mas_apps:
+  - { name: 1Password 7 - Password Manager,id: 1295203466 }
+  - { name: Apple Configurator 2,id: 1037126344 }
+  - { name: Blackmagic Disk Speed Test, id: 425264550 }
+  - { name: Final Cut Pro,id: 424389933 }
+  - { name: Magnet,id: 1333542190 }
+  - { name: Microsoft Excel,id: 1482454543 }
+  - { name: Microsoft Remote Desktop,id: 639968404 }
+  - { name: Parcel - Delivery Tracking,id: 462058435 }
+  - { name: Twitter,id: 1451685025 }
+  - { name: WhatsApp Desktop, id: 1147396723 }
+  - { name: WireGuard,id: 441258766 }

requirements.yml

@@ -1,15 +1,27 @@
-- src: 'https://github.com/MayNiklas/ansible-git.git'
-  name: ansible-git
-  scm: git
-- src: 'https://github.com/MayNiklas/ansible-ssh.git'
-  name: ansible-ssh
-  scm: git
-- src: 'https://github.com/MayNiklas/ansible-osx_defaults.git'
-  name: ansible-osx_defaults
-  scm: git
-- src: 'https://github.com/MayNiklas/ansible-homebrew.git'
-  name: ansible-homebrew
-  scm: git
-- src: 'https://github.com/MayNiklas/ansible-mas.git'
-  name: ansible-mas
-  scm: git
+---
+# roles:
+#   - src: 'https://github.com/MayNiklas/ansible-git.git'
+#     name: ansible-git
+#     scm: git
+#   - src: 'https://github.com/MayNiklas/ansible-yubikey-mac.git'
+#     name: ansible-yubikey
+#     scm: git
+#   - src: 'https://github.com/MayNiklas/ansible-ssh.git'
+#     name: ansible-ssh
+#     scm: git
+#   - src: 'https://github.com/MayNiklas/ansible-osx_defaults.git'
+#     name: ansible-osx_defaults
+#     scm: git
+#   - src: 'https://github.com/MayNiklas/ansible-homebrew.git'
+#     name: ansible-homebrew
+#     scm: git
+#   - src: 'https://github.com/MayNiklas/ansible-mas.git'
+#     name: ansible-mas
+#     scm: git
+#   - src: 'https://github.com/MayNiklas/ansible-shell-mac.git'
+#     name: ansible-shell-mac
+#     scm: git
+
+collections:
+  - name: community.general
+    source: https://galaxy.ansible.com

site.yml

@@ -4,11 +4,15 @@
   roles:
     - role: ansible-git
       when: configure_git
+    - role: ansible-homebrew
+      when: configure_brew
+    - role: ansible-shell-mac
+      when: configure_shell
+    - role: ansible-yubikey
+      when: configure_yubikey
     - role: ansible-ssh
       when: configure_ssh
     - role: ansible-osx_defaults
       when: configure_osx
-    - role: ansible-homebrew
-      when: configure_brew
     - role: ansible-mas
       when: configure_mas