From d5538da7d3cf20b14ebae418c4ed78bdff07158a Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Mon, 16 Nov 2020 20:41:10 +0100 Subject: [PATCH 01/40] =?UTF-8?q?=E2=86=97=EF=B8=8F=20Removed=20Git=20edit?= =?UTF-8?q?or=20parameter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "\nhost_vars/localhost.yml" => host_vars/localhost.yml | 1 - 1 file changed, 1 deletion(-) rename "\nhost_vars/localhost.yml" => host_vars/localhost.yml (98%) diff --git "a/\nhost_vars/localhost.yml" b/host_vars/localhost.yml similarity index 98% rename from "\nhost_vars/localhost.yml" rename to host_vars/localhost.yml index 9186fc6..a25319b 100644 --- "a/\nhost_vars/localhost.yml" +++ b/host_vars/localhost.yml @@ -10,7 +10,6 @@ ssh_comment: macbook configure_git: yes git_mail: user@example.com git_name: MayNiklas -git_editor: "subl -n -w" configure_brew: true homebrew_taps: From 8bea849a6895f324fb42c779772db41d404ed47e Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Mon, 16 Nov 2020 21:36:13 +0100 Subject: [PATCH 02/40] =?UTF-8?q?=E2=86=97=EF=B8=8F=20README:=20fixed=20ou?= =?UTF-8?q?tdated=20information?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1026847..21f78d0 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,12 @@ brew install ansible ``` ### Configure the variables to your liking ``` -cp default.config.yml config.yml -nano config.yml +nano host_vars/localhost.yml +``` + +### Install required roles +``` +ansible-galaxy install -r requirements.yml ``` ### Executing playbook From 20d1aea562371e032073b50284916bb34348d285 Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Mon, 16 Nov 2020 21:47:51 +0100 Subject: [PATCH 03/40] =?UTF-8?q?=E2=86=97=EF=B8=8F=20README:=20renamed=20?= =?UTF-8?q?main.yml=20->=20site.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21f78d0..7ffc54e 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ ansible-galaxy install -r requirements.yml ### Executing playbook ```bash -ansible-playbook main.yml +ansible-playbook site.yml ``` Preperation: From 6cfb608f1f89ec69b6aa6c236be5cb5d9131b498 Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Fri, 12 Mar 2021 01:16:05 +0100 Subject: [PATCH 04/40] =?UTF-8?q?=E2=86=97=EF=B8=8F=20install=20drone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- host_vars/localhost.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index a25319b..f469878 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -16,6 +16,7 @@ homebrew_taps: - homebrew/core - homebrew/cask - homebrew/cask-drivers + - drone/drone homebrew_apps: - signal @@ -50,6 +51,7 @@ homebrew_apps: - vmware-fusion homebrew_packages: + - drone - mas - ansible - iperf3 From a2ec9be202af2ddd76e19029d03890de68f9705b Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Sat, 20 Mar 2021 15:50:20 +0100 Subject: [PATCH 05/40] Add ansible-yubikey-mac to requirements --- requirements.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.yml b/requirements.yml index ae8548b..2308e39 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,6 +1,9 @@ - src: 'https://github.com/MayNiklas/ansible-git.git' name: ansible-git scm: git +- src: 'https://github.com/MayNiklas/ansible-yubikey-mac.git' + name: ansible-git + scm: git - src: 'https://github.com/MayNiklas/ansible-ssh.git' name: ansible-ssh scm: git From 7476c733ce98d5e223243795aadad7ca4873bb92 Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Sat, 20 Mar 2021 15:51:33 +0100 Subject: [PATCH 06/40] Add ansible-yubikey to playbook --- site.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site.yml b/site.yml index cf20e43..877164a 100644 --- a/site.yml +++ b/site.yml @@ -4,6 +4,8 @@ roles: - role: ansible-git when: configure_git + - role: ansible-yubikey-mac + when: configure_yubikey - role: ansible-ssh when: configure_ssh - role: ansible-osx_defaults From 8531d078d73e30e9e799923bebe9536ec696fae9 Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Sat, 20 Mar 2021 15:51:59 +0100 Subject: [PATCH 07/40] set configure_yubikey = true --- host_vars/localhost.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index f469878..627177e 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -2,6 +2,8 @@ configure_osx: true +configure_yubikey: true + configure_ssh: true ssh_path: ~/.ssh/id_rsa ssh_size: 4096 From d99e17b8db52a4a2a6311bb794746e1d21996974 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Sat, 20 Mar 2021 15:54:48 +0100 Subject: [PATCH 08/40] Fix name of yubikey role --- requirements.yml | 2 +- site.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.yml b/requirements.yml index 2308e39..c966211 100644 --- a/requirements.yml +++ b/requirements.yml @@ -2,7 +2,7 @@ name: ansible-git scm: git - src: 'https://github.com/MayNiklas/ansible-yubikey-mac.git' - name: ansible-git + name: ansible-yubikey scm: git - src: 'https://github.com/MayNiklas/ansible-ssh.git' name: ansible-ssh diff --git a/site.yml b/site.yml index 877164a..1f800ff 100644 --- a/site.yml +++ b/site.yml @@ -4,7 +4,7 @@ roles: - role: ansible-git when: configure_git - - role: ansible-yubikey-mac + - role: ansible-yubikey when: configure_yubikey - role: ansible-ssh when: configure_ssh From 4e9a9504675b551a4ee523aa8ba39e8063762d95 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Sat, 17 Apr 2021 17:31:05 +0200 Subject: [PATCH 09/40] Add ansible-shell-mac --- host_vars/localhost.yml | 2 ++ requirements.yml | 3 +++ site.yml | 2 ++ 3 files changed, 7 insertions(+) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index 627177e..9b38fa3 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -4,6 +4,8 @@ configure_osx: true configure_yubikey: true +configure_shell: true + configure_ssh: true ssh_path: ~/.ssh/id_rsa ssh_size: 4096 diff --git a/requirements.yml b/requirements.yml index c966211..6b600f9 100644 --- a/requirements.yml +++ b/requirements.yml @@ -16,3 +16,6 @@ - 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 diff --git a/site.yml b/site.yml index 1f800ff..32fde4e 100644 --- a/site.yml +++ b/site.yml @@ -14,3 +14,5 @@ when: configure_brew - role: ansible-mas when: configure_mas + - role: ansible-shell-mac + when: configure_shell \ No newline at end of file From 9ca18278c28e1b1cd3e13a8b750738ac9e2a2ad3 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Sat, 17 Apr 2021 17:31:47 +0200 Subject: [PATCH 10/40] include git_mail --- host_vars/localhost.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index 9b38fa3..e6d9572 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -12,7 +12,7 @@ ssh_size: 4096 ssh_comment: macbook configure_git: yes -git_mail: user@example.com +git_mail: info@niklas-steffen.de git_name: MayNiklas configure_brew: true From 9263b3636d1034db2587c7b95fad3803c970ebff Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Sat, 17 Apr 2021 17:34:02 +0200 Subject: [PATCH 11/40] remove applications - teamspeak-client - parsec - cyberduck - synology-drive - wacom-tablet --- host_vars/localhost.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index e6d9572..40365da 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -26,7 +26,6 @@ homebrew_apps: - signal - discord - telegram - - teamspeak-client - whatsapp - docker - firefox @@ -38,17 +37,13 @@ homebrew_apps: - spotify - vlc - obs - - parsec - plex - ultimaker-cura - sublime-text - filebot - - cyberduck - forklift - balenaetcher - cleanmymac - - synology-drive - - wacom-tablet - yubico-authenticator - eizo-colornavigator - monitorcontrol From 044352b897074259c1a53486181ef29ed79d0c00 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Sat, 17 Apr 2021 18:22:29 +0200 Subject: [PATCH 12/40] Sort dependencies alphabetically --- host_vars/localhost.yml | 66 ++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index 40365da..3d80520 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -23,57 +23,57 @@ homebrew_taps: - drone/drone homebrew_apps: - - signal + - adobe-creative-cloud + - balenaetcher + - chromium + - cleanmymac - discord - - telegram - - whatsapp - docker + - eizo-colornavigator + - filebot - firefox - - chromium - - tor-browser - - adobe-creative-cloud - - jetbrains-toolbox + - forklift - github - - spotify - - vlc + - jetbrains-toolbox + - monitorcontrol - obs - plex - - ultimaker-cura + - signal + - spotify - sublime-text - - filebot - - forklift - - balenaetcher - - cleanmymac - - yubico-authenticator - - eizo-colornavigator - - monitorcontrol + - telegram + - tor-browser + - ultimaker-cura + - vlc - vmware-fusion + - whatsapp + - yubico-authenticator homebrew_packages: - - drone - - mas - ansible - - iperf3 - - nmap - - wakeonlan + - docker-compose + - drone - fish - git - - wget - - hugo + - glances - gradle - htop - - glances - - docker-compose + - hugo + - iperf3 + - mas + - nmap + - wakeonlan + - wget configure_mas: true mas_apps: - - { name: 1Password 7 - Password Manager, id: 1333542190 } - - { name: Twitter, id: 1482454543 } - - { name: WireGuard, id: 1451685025 } - - { name: Microsoft Excel, id: 462058435 } - - { name: Microsoft Remote Desktop, id: 1295203466 } - - { name: Magnet, id: 441258766 } - - { name: Parcel - Delivery Tracking, id: 639968404 } + - { name: 1Password 7 - Password Manager,id: 1295203466 } + - { name: Magnet,id: 1333542190 } + - { name: Twitter,id: 1451685025 } + - { name: Microsoft Excel,id: 1482454543 } + - { name: WireGuard,id: 441258766 } + - { name: Parcel - Delivery Tracking,id: 462058435 } + - { name: Microsoft Remote Desktop,id: 639968404 } From bed2dbdc699d5d9c914e1da8fd9a575c9b29d89d Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Tue, 20 Apr 2021 13:13:18 +0200 Subject: [PATCH 13/40] install vscode --- host_vars/localhost.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index 3d80520..fd839c7 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -45,6 +45,7 @@ homebrew_apps: - tor-browser - ultimaker-cura - vlc + - visual-studio-code - vmware-fusion - whatsapp - yubico-authenticator From 9e91fbbeb9780139b288e9add3fb61526547f61f Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Mon, 3 May 2021 13:37:56 +0200 Subject: [PATCH 14/40] install Apple Configurator 2 --- host_vars/localhost.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index fd839c7..bbbc698 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -69,6 +69,7 @@ homebrew_packages: configure_mas: true mas_apps: - { name: 1Password 7 - Password Manager,id: 1295203466 } + - { name: Apple Configurator 2,id: 1037126344 } - { name: Magnet,id: 1333542190 } - { name: Twitter,id: 1451685025 } - { name: Microsoft Excel,id: 1482454543 } From a79d798636572a810da7591b931b63ba3d31ad69 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Thu, 28 Oct 2021 11:42:06 +0200 Subject: [PATCH 15/40] Add community.general to requirements --- requirements.yml | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/requirements.yml b/requirements.yml index 6b600f9..94c9eb7 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,21 +1,27 @@ -- 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 +--- +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 From bd220433ca52ee8653b0812558cd4a26211a7c7c Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Thu, 28 Oct 2021 11:42:30 +0200 Subject: [PATCH 16/40] don't configure ssh by default --- host_vars/localhost.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index bbbc698..daf2066 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -6,7 +6,7 @@ configure_yubikey: true configure_shell: true -configure_ssh: true +configure_ssh: false ssh_path: ~/.ssh/id_rsa ssh_size: 4096 ssh_comment: macbook From 21d660d8e3f79b61eab0efdba54178fecef81547 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Thu, 28 Oct 2021 11:42:52 +0200 Subject: [PATCH 17/40] remove apps --- host_vars/localhost.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index daf2066..d602d55 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -29,10 +29,10 @@ homebrew_apps: - cleanmymac - discord - docker - - eizo-colornavigator - - filebot +# - eizo-colornavigator +# - filebot - firefox - - forklift +# - forklift - github - jetbrains-toolbox - monitorcontrol @@ -54,10 +54,8 @@ homebrew_packages: - ansible - docker-compose - drone - - fish - git - glances - - gradle - htop - hugo - iperf3 @@ -76,6 +74,3 @@ mas_apps: - { name: WireGuard,id: 441258766 } - { name: Parcel - Delivery Tracking,id: 462058435 } - { name: Microsoft Remote Desktop,id: 639968404 } - - - From 559c617c18c8805b86da8a22efeda88e4a644ac1 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Thu, 28 Oct 2021 15:01:51 +0200 Subject: [PATCH 18/40] install zoom --- host_vars/localhost.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index d602d55..78b32d4 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -49,6 +49,7 @@ homebrew_apps: - vmware-fusion - whatsapp - yubico-authenticator + - zoom homebrew_packages: - ansible From daebbde761c0fa13850e96341ed20d4ec4245ab9 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Thu, 28 Oct 2021 16:38:20 +0200 Subject: [PATCH 19/40] install youtube-dl --- host_vars/localhost.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index 78b32d4..2e9ad1b 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -64,6 +64,7 @@ homebrew_packages: - nmap - wakeonlan - wget + - youtube-dl configure_mas: true mas_apps: From 59e21fbe6a169f67e463ce9a54b34fe63366fd0f Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Fri, 29 Oct 2021 11:50:16 +0200 Subject: [PATCH 20/40] install raspberry-pi-imager --- host_vars/localhost.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index 2e9ad1b..f711ae5 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -38,6 +38,7 @@ homebrew_apps: - monitorcontrol - obs - plex + - raspberry-pi-imager - signal - spotify - sublime-text From 2ee7094acf81ab91453f79ce865daeb5c0304c07 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Fri, 29 Oct 2021 18:05:43 +0200 Subject: [PATCH 21/40] install atom --- host_vars/localhost.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index f711ae5..2400dac 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -23,6 +23,7 @@ homebrew_taps: - drone/drone homebrew_apps: + - atom - adobe-creative-cloud - balenaetcher - chromium From 91ae70b603b7a8d2d90320e6b1d1492512ec9f30 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Sun, 7 Nov 2021 15:24:12 +0100 Subject: [PATCH 22/40] Install Disk Speed Test & Final Cut Pro --- host_vars/localhost.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index 2400dac..a8ecce1 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -72,6 +72,8 @@ 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: Twitter,id: 1451685025 } - { name: Microsoft Excel,id: 1482454543 } From 41951a41eb3e484fa998630bd03e8aa449c27167 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Sun, 7 Nov 2021 15:25:38 +0100 Subject: [PATCH 23/40] Install Whatsapp via App Store --- host_vars/localhost.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index a8ecce1..8151669 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -49,7 +49,6 @@ homebrew_apps: - vlc - visual-studio-code - vmware-fusion - - whatsapp - yubico-authenticator - zoom @@ -78,5 +77,6 @@ mas_apps: - { name: Twitter,id: 1451685025 } - { name: Microsoft Excel,id: 1482454543 } - { name: WireGuard,id: 441258766 } + - { name: WhatsApp Desktop, id: 1147396723 } - { name: Parcel - Delivery Tracking,id: 462058435 } - { name: Microsoft Remote Desktop,id: 639968404 } From 01e1e21cb72297764d668ba3800294faeb8d80c9 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Fri, 3 Dec 2021 13:09:32 +0100 Subject: [PATCH 24/40] install mpv --- host_vars/localhost.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index 8151669..53b037c 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -37,6 +37,7 @@ homebrew_apps: - github - jetbrains-toolbox - monitorcontrol + - mpv - obs - plex - raspberry-pi-imager From 3b7a8f4a8be86c2ae44adee256121682a0c5028e Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Thu, 23 Dec 2021 00:24:26 +0100 Subject: [PATCH 25/40] install element & asciinema --- host_vars/localhost.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index 53b037c..35ca6ac 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -30,6 +30,7 @@ homebrew_apps: - cleanmymac - discord - docker + - element # - eizo-colornavigator # - filebot - firefox @@ -55,6 +56,7 @@ homebrew_apps: homebrew_packages: - ansible + - asciinema - docker-compose - drone - git From c9a5393371926a248b7d55dc5b2b7826256feb10 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 26 Apr 2022 20:52:05 +0200 Subject: [PATCH 26/40] collections install path --- .gitignore | 1 + ansible.cfg | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 46f0bc5..c7fcddd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # ---> Ansible *.retry +collections roles # ---> Vim diff --git a/ansible.cfg b/ansible.cfg index 955fff6..d6cbffb 100644 --- a/ansible.cfg +++ b/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] From 08c60495b73b10abcd439fbf1ff8e8f00d1ba0f8 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 26 Apr 2022 21:13:26 +0200 Subject: [PATCH 27/40] remove unused apps --- host_vars/localhost.yml | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/host_vars/localhost.yml b/host_vars/localhost.yml index 35ca6ac..4453194 100644 --- a/host_vars/localhost.yml +++ b/host_vars/localhost.yml @@ -23,34 +23,21 @@ homebrew_taps: - drone/drone homebrew_apps: - - atom - adobe-creative-cloud - - balenaetcher - - chromium - - cleanmymac - discord - docker - element -# - eizo-colornavigator -# - filebot - firefox -# - forklift - github - jetbrains-toolbox - monitorcontrol - - mpv - - obs - plex - - raspberry-pi-imager - signal - spotify - sublime-text - telegram - - tor-browser - - ultimaker-cura - vlc - visual-studio-code - - vmware-fusion - yubico-authenticator - zoom @@ -58,17 +45,13 @@ homebrew_packages: - ansible - asciinema - docker-compose - - drone - git - - glances - - htop - hugo - iperf3 - mas - nmap - wakeonlan - wget - - youtube-dl configure_mas: true mas_apps: @@ -77,9 +60,9 @@ mas_apps: - { name: Blackmagic Disk Speed Test, id: 425264550 } - { name: Final Cut Pro,id: 424389933 } - { name: Magnet,id: 1333542190 } - - { name: Twitter,id: 1451685025 } - { name: Microsoft Excel,id: 1482454543 } - - { name: WireGuard,id: 441258766 } - - { name: WhatsApp Desktop, id: 1147396723 } - - { name: Parcel - Delivery Tracking,id: 462058435 } - { 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 } From 5078d388d1bef3e605bc05b00c4111a8fe779f23 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 26 Apr 2022 21:22:45 +0200 Subject: [PATCH 28/40] Add roles as submodule --- .gitmodules | 21 ++++++++++++++++++ requirements.yml | 44 +++++++++++++++++++------------------- roles/ansible-git | 1 + roles/ansible-homebrew | 1 + roles/ansible-mas | 1 + roles/ansible-osx_defaults | 1 + roles/ansible-shell-mac | 1 + roles/ansible-ssh | 1 + roles/ansible-yubikey | 1 + 9 files changed, 50 insertions(+), 22 deletions(-) create mode 100644 .gitmodules create mode 160000 roles/ansible-git create mode 160000 roles/ansible-homebrew create mode 160000 roles/ansible-mas create mode 160000 roles/ansible-osx_defaults create mode 160000 roles/ansible-shell-mac create mode 160000 roles/ansible-ssh create mode 160000 roles/ansible-yubikey diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..9bf9f8d --- /dev/null +++ b/.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 diff --git a/requirements.yml b/requirements.yml index 94c9eb7..8e7b56e 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,26 +1,26 @@ --- -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 +# 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 diff --git a/roles/ansible-git b/roles/ansible-git new file mode 160000 index 0000000..ccf42e3 --- /dev/null +++ b/roles/ansible-git @@ -0,0 +1 @@ +Subproject commit ccf42e385aa119fc171e0c98497c23b9e28a52a6 diff --git a/roles/ansible-homebrew b/roles/ansible-homebrew new file mode 160000 index 0000000..b9d138a --- /dev/null +++ b/roles/ansible-homebrew @@ -0,0 +1 @@ +Subproject commit b9d138a33dd50d5d92d4c598b3018e705a448f01 diff --git a/roles/ansible-mas b/roles/ansible-mas new file mode 160000 index 0000000..d2ea82b --- /dev/null +++ b/roles/ansible-mas @@ -0,0 +1 @@ +Subproject commit d2ea82b90c1ff33c266aa4ec6a1cd1f828bae905 diff --git a/roles/ansible-osx_defaults b/roles/ansible-osx_defaults new file mode 160000 index 0000000..199bbb1 --- /dev/null +++ b/roles/ansible-osx_defaults @@ -0,0 +1 @@ +Subproject commit 199bbb1aa59d0e047d3a0df2254b82ac9ea916ec diff --git a/roles/ansible-shell-mac b/roles/ansible-shell-mac new file mode 160000 index 0000000..19db288 --- /dev/null +++ b/roles/ansible-shell-mac @@ -0,0 +1 @@ +Subproject commit 19db288768e5229931115a2f66544ea6567ccd41 diff --git a/roles/ansible-ssh b/roles/ansible-ssh new file mode 160000 index 0000000..2d1a087 --- /dev/null +++ b/roles/ansible-ssh @@ -0,0 +1 @@ +Subproject commit 2d1a08779cd6c24a34c4bf0ee1d1ad1c726cac46 diff --git a/roles/ansible-yubikey b/roles/ansible-yubikey new file mode 160000 index 0000000..d2789fe --- /dev/null +++ b/roles/ansible-yubikey @@ -0,0 +1 @@ +Subproject commit d2789feabd623da2731ff2c90d95e36f58c08207 From c2cfb4c40c64542fdf7200cad7d05c421f61bf7f Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Tue, 26 Apr 2022 21:27:18 +0200 Subject: [PATCH 29/40] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 7ffc54e..3dc00e9 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,10 @@ ```bash /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" ``` +### Clone repository +```bash +git clone --recursive https://github.com/MayNiklas/ansible-mac.git +``` ### Installing Ansible ```bash From cd3f12ec1441be1b8e8e164d0e604bd21d4c7639 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 3 May 2022 10:44:38 +0200 Subject: [PATCH 30/40] update osx_defaults submodule --- roles/ansible-osx_defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ansible-osx_defaults b/roles/ansible-osx_defaults index 199bbb1..503bfc8 160000 --- a/roles/ansible-osx_defaults +++ b/roles/ansible-osx_defaults @@ -1 +1 @@ -Subproject commit 199bbb1aa59d0e047d3a0df2254b82ac9ea916ec +Subproject commit 503bfc8738202d93ab4fc0b86d5ba8a4bde5817e From aaaa67acb53248eca43161b61891e5674fd5bf24 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 3 May 2022 10:55:55 +0200 Subject: [PATCH 31/40] update submodule creating homebrew line --- roles/ansible-homebrew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ansible-homebrew b/roles/ansible-homebrew index b9d138a..872c2f8 160000 --- a/roles/ansible-homebrew +++ b/roles/ansible-homebrew @@ -1 +1 @@ -Subproject commit b9d138a33dd50d5d92d4c598b3018e705a448f01 +Subproject commit 872c2f8124b4d781546fe41cd0a3ca6be681d244 From 2877a1a4ad8fbdb629015f972539741767decada Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 3 May 2022 10:59:39 +0200 Subject: [PATCH 32/40] execute homebrew before yubikey --- site.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.yml b/site.yml index 32fde4e..9177444 100644 --- a/site.yml +++ b/site.yml @@ -4,14 +4,14 @@ roles: - role: ansible-git when: configure_git + - role: ansible-homebrew + when: configure_brew - 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 - role: ansible-shell-mac From 5b451350ab7853bbb2a2a186520823c921220d22 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 3 May 2022 11:06:48 +0200 Subject: [PATCH 33/40] update shell submodule - both archs in one block --- roles/ansible-shell-mac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ansible-shell-mac b/roles/ansible-shell-mac index 19db288..e7d11be 160000 --- a/roles/ansible-shell-mac +++ b/roles/ansible-shell-mac @@ -1 +1 @@ -Subproject commit 19db288768e5229931115a2f66544ea6567ccd41 +Subproject commit e7d11bef04adde8c78b07f88c193dae91ea2fce1 From 7e0d3d305ba3be2ac7eb5735f211e2646729bcd2 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 3 May 2022 11:07:08 +0200 Subject: [PATCH 34/40] Change execution order --- site.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.yml b/site.yml index 9177444..cb73182 100644 --- a/site.yml +++ b/site.yml @@ -6,6 +6,8 @@ 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 @@ -14,5 +16,3 @@ when: configure_osx - role: ansible-mas when: configure_mas - - role: ansible-shell-mac - when: configure_shell \ No newline at end of file From 0856f3f006f62d56d1480bd3ae651a9096c953a7 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 3 May 2022 11:15:33 +0200 Subject: [PATCH 35/40] update shell submodule - create ~/.zshrc --- roles/ansible-shell-mac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ansible-shell-mac b/roles/ansible-shell-mac index e7d11be..f7214ac 160000 --- a/roles/ansible-shell-mac +++ b/roles/ansible-shell-mac @@ -1 +1 @@ -Subproject commit e7d11bef04adde8c78b07f88c193dae91ea2fce1 +Subproject commit f7214acbdb3fe0f874a113e44a92c0efb76b0b37 From c9d449d590dfd4e841c88782d29c662601949446 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 3 May 2022 11:27:40 +0200 Subject: [PATCH 36/40] update submodule - add promt --- roles/ansible-shell-mac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ansible-shell-mac b/roles/ansible-shell-mac index f7214ac..fddfc11 160000 --- a/roles/ansible-shell-mac +++ b/roles/ansible-shell-mac @@ -1 +1 @@ -Subproject commit f7214acbdb3fe0f874a113e44a92c0efb76b0b37 +Subproject commit fddfc11b44fe405e849f9936773039eab99fcb94 From 8dedb2ac5a1f6c1507e341b79031de925f660422 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 3 May 2022 11:35:14 +0200 Subject: [PATCH 37/40] update submodule - yubikey in .zshrc --- roles/ansible-yubikey | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ansible-yubikey b/roles/ansible-yubikey index d2789fe..e069a95 160000 --- a/roles/ansible-yubikey +++ b/roles/ansible-yubikey @@ -1 +1 @@ -Subproject commit d2789feabd623da2731ff2c90d95e36f58c08207 +Subproject commit e069a9527ffe85a4018d66633d879351b3c21c10 From fabe9c5fdfbb210c5e5c1231b0f3dbd5301bafc4 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 3 May 2022 16:15:27 +0200 Subject: [PATCH 38/40] add redhat.ansible to .vscode --- .vscode/extensions.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..3d606e0 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "redhat.ansible" + ] +} \ No newline at end of file From 39d103ab0ed73c5453f1d3de6a88942bad14783b Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 3 May 2022 16:54:35 +0200 Subject: [PATCH 39/40] update submodule: osx_defaults --- roles/ansible-osx_defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ansible-osx_defaults b/roles/ansible-osx_defaults index 503bfc8..cb975be 160000 --- a/roles/ansible-osx_defaults +++ b/roles/ansible-osx_defaults @@ -1 +1 @@ -Subproject commit 503bfc8738202d93ab4fc0b86d5ba8a4bde5817e +Subproject commit cb975be6754e1395a5a673bdbe38ad695946b21b From a02d8e8a39e23b4f28a29b0ba6d3e4c35930ce57 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Tue, 3 May 2022 17:45:24 +0200 Subject: [PATCH 40/40] add info about used roles --- README.md | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 3dc00e9..293e7d8 100644 --- a/README.md +++ b/README.md @@ -3,31 +3,33 @@ [![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)" -``` -### Clone repository -```bash + +# clone repository git clone --recursive https://github.com/MayNiklas/ansible-mac.git -``` -### Installing Ansible -```bash +# install ansible brew install ansible -``` -### Configure the variables to your liking -``` + +# Configure the variables to your liking nano host_vars/localhost.yml -``` -### Install required roles -``` +# Install required roles ansible-galaxy install -r requirements.yml -``` -### Executing playbook -```bash +# execute playbook ansible-playbook site.yml ```