From c0e471fcc0d1741daeb9b2bb75a93d6be6f7591e Mon Sep 17 00:00:00 2001 From: Shotaro Kohama Date: Sun, 7 Jul 2024 21:33:32 -0700 Subject: [PATCH 1/8] Update homebrew packages and casks --- roles/common/vars/main.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/roles/common/vars/main.yml b/roles/common/vars/main.yml index 75321c9..e2310d1 100644 --- a/roles/common/vars/main.yml +++ b/roles/common/vars/main.yml @@ -41,11 +41,7 @@ homebrew_packages: homebrew_cask_packages: - 1password - - alfred - - bartender - discord - - docker - - dropbox - google-chrome - google-cloud-sdk - grammarly From ad843ebc75fd246fe416ab1c17fc6211d8c3bec2 Mon Sep 17 00:00:00 2001 From: Shotaro Kohama Date: Sun, 7 Jul 2024 21:42:49 -0700 Subject: [PATCH 2/8] Update homebrew packages and casks (take 2) --- roles/common/vars/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/common/vars/main.yml b/roles/common/vars/main.yml index e2310d1..3babd4c 100644 --- a/roles/common/vars/main.yml +++ b/roles/common/vars/main.yml @@ -2,6 +2,7 @@ homebrew_packages: - act - ag - ansible + - asdf - aspell - autojump - awscli From 4415ffc6c3f12f0a9076e8f13d5ba6351f6fc446 Mon Sep 17 00:00:00 2001 From: Shotaro Kohama Date: Sun, 7 Jul 2024 21:46:57 -0700 Subject: [PATCH 3/8] Update homebrew packages and casks (take 3) --- requirements.dev.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.dev.txt b/requirements.dev.txt index 4cfe645..d0104e8 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -1,3 +1,3 @@ yamllint==1.26.3 -ansible==4.8.0 -ansible-lint==5.3.2 +ansible==10.1.0 +ansible-lint==24.6.1 From 44333b1d4ffb10bfbf3983821a54c1111bba951d Mon Sep 17 00:00:00 2001 From: Shotaro Kohama Date: Sun, 7 Jul 2024 21:48:00 -0700 Subject: [PATCH 4/8] Update homebrew packages and casks (take 4) --- requirements.dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.dev.txt b/requirements.dev.txt index d0104e8..bcb3442 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -1,3 +1,3 @@ -yamllint==1.26.3 +yamllint==1.35.1 ansible==10.1.0 ansible-lint==24.6.1 From d6626d5d446d252a3fb43eea77401343e61ac82d Mon Sep 17 00:00:00 2001 From: Shotaro Kohama Date: Sun, 7 Jul 2024 21:54:34 -0700 Subject: [PATCH 5/8] Update homebrew packages and casks (take 5) --- roles/common/handlers/main.yml | 4 ++-- roles/common/tasks/homebrew-cask.yml | 2 +- roles/common/tasks/homebrew.yml | 2 +- roles/common/tasks/main.yml | 10 +++++----- roles/common/vars/main.yml | 4 ++-- roles/gitconfig/tasks/config.yml | 8 ++++---- roles/gitconfig/vars/main.yml | 8 ++++---- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml index 59f0af9..6e4d7cc 100644 --- a/roles/common/handlers/main.yml +++ b/roles/common/handlers/main.yml @@ -1,6 +1,6 @@ --- - name: Refresh Dock - command: killall Dock + ansible.builtin.command: killall Dock - name: Refresh Finder - command: killall Finder + ansible.builtin.command: killall Finder diff --git a/roles/common/tasks/homebrew-cask.yml b/roles/common/tasks/homebrew-cask.yml index 4d8a1d4..9c804b7 100644 --- a/roles/common/tasks/homebrew-cask.yml +++ b/roles/common/tasks/homebrew-cask.yml @@ -1,5 +1,5 @@ - name: Install cask packages community.general.homebrew_cask: name: "{{ item }}" - loop: "{{ homebrew_cask_packages }}" + loop: "{{ common_homebrew_cask_packages }}" tags: cask diff --git a/roles/common/tasks/homebrew.yml b/roles/common/tasks/homebrew.yml index c4cea02..7fa01b2 100644 --- a/roles/common/tasks/homebrew.yml +++ b/roles/common/tasks/homebrew.yml @@ -1,5 +1,5 @@ - name: Install brew packages community.general.homebrew: name: "{{ item }}" - loop: "{{ homebrew_packages }}" + loop: "{{ common_homebrew_packages }}" tags: brew diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 0788583..985ba09 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -1,6 +1,6 @@ --- -- import_tasks: homebrew.yml -- import_tasks: homebrew-cask.yml -- import_tasks: oh-my-zsh.yml -- import_tasks: dotfiles.yml -- import_tasks: osx-defaults.yml +- ansible.builtin.import_tasks: homebrew.yml +- ansible.builtin.import_tasks: homebrew-cask.yml +- ansible.builtin.import_tasks: oh-my-zsh.yml +- ansible.builtin.import_tasks: dotfiles.yml +- ansible.builtin.import_tasks: osx-defaults.yml diff --git a/roles/common/vars/main.yml b/roles/common/vars/main.yml index 3babd4c..6436ad7 100644 --- a/roles/common/vars/main.yml +++ b/roles/common/vars/main.yml @@ -1,4 +1,4 @@ -homebrew_packages: +common_homebrew_packages: - act - ag - ansible @@ -40,7 +40,7 @@ homebrew_packages: - watch - wget -homebrew_cask_packages: +common_homebrew_cask_packages: - 1password - discord - google-chrome diff --git a/roles/gitconfig/tasks/config.yml b/roles/gitconfig/tasks/config.yml index 63aaa12..a59af34 100644 --- a/roles/gitconfig/tasks/config.yml +++ b/roles/gitconfig/tasks/config.yml @@ -2,14 +2,14 @@ community.general.git_config: name: user.name scope: global - value: "{{ gitname }}" + value: "{{ gitconfig_gitname }}" tags: gitconfig - name: Configure user.email of .gitconfig globally community.general.git_config: name: user.email scope: global - value: "{{ gitmail }}" + value: "{{ gitconfig_gitmail }}" tags: gitconfig - name: Configure color.ui of .gitconfig globally @@ -23,12 +23,12 @@ community.general.git_config: name: core.editor scope: global - value: "{{ editor }}" + value: "{{ gitconfig_editor }}" tags: gitconfig - name: Configure core.excludefile of .gitconfig globally community.general.git_config: name: core.excludesfile scope: global - value: "{{ excludes_path }}" + value: "{{ gitconfig_excludes_path }}" tags: gitconfig diff --git a/roles/gitconfig/vars/main.yml b/roles/gitconfig/vars/main.yml index d0f30ac..7fefbbf 100644 --- a/roles/gitconfig/vars/main.yml +++ b/roles/gitconfig/vars/main.yml @@ -1,5 +1,5 @@ --- -gitname: Shotaro Kohama -gitmail: khmshtr28@gmail.com -editor: emacs -excludes_path: "{{ lookup('env', 'HOME') }}/.gitexcludesfile" +gitconfig_gitname: Shotaro Kohama +gitconfig_gitmail: khmshtr28@gmail.com +gitconfig_editor: emacs +gitconfig_excludes_path: "{{ lookup('env', 'HOME') }}/.gitexcludesfile" From 556b53d77a3b2b7f5bcb8364c64ad42c7b92dbc2 Mon Sep 17 00:00:00 2001 From: Shotaro Kohama Date: Sun, 7 Jul 2024 21:58:52 -0700 Subject: [PATCH 6/8] Update homebrew packages and casks (take 6) --- roles/common/tasks/main.yml | 15 ++++++++++----- roles/gitconfig/tasks/main.yml | 6 ++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 985ba09..4d822b1 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -1,6 +1,11 @@ --- -- ansible.builtin.import_tasks: homebrew.yml -- ansible.builtin.import_tasks: homebrew-cask.yml -- ansible.builtin.import_tasks: oh-my-zsh.yml -- ansible.builtin.import_tasks: dotfiles.yml -- ansible.builtin.import_tasks: osx-defaults.yml +- name: Install homebrew packages + ansible.builtin.import_tasks: homebrew.yml +- name: Install homebrew cask packages + ansible.builtin.import_tasks: homebrew-cask.yml +- name: Set up oh-my-zsh + ansible.builtin.import_tasks: oh-my-zsh.yml +- name: Set up dotfiles + ansible.builtin.import_tasks: dotfiles.yml +- name: Set up macos settings + ansible.builtin.import_tasks: osx-defaults.yml diff --git a/roles/gitconfig/tasks/main.yml b/roles/gitconfig/tasks/main.yml index 79fa30f..dec9423 100644 --- a/roles/gitconfig/tasks/main.yml +++ b/roles/gitconfig/tasks/main.yml @@ -1,3 +1,5 @@ --- -- import_tasks: config.yml -- import_tasks: ignore.yml +- name: Set up gitconfig + ansible.builtin.import_tasks: config.yml +- name: Set up gitignore + ansible.builtin.import_tasks: ignore.yml From 9e7aaa1deb9e72cf98409eca125816b9aabd0cf1 Mon Sep 17 00:00:00 2001 From: Shotaro Kohama Date: Sun, 7 Jul 2024 22:02:47 -0700 Subject: [PATCH 7/8] Update homebrew packages and casks (take 7) --- roles/common/handlers/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml index 6e4d7cc..b936a25 100644 --- a/roles/common/handlers/main.yml +++ b/roles/common/handlers/main.yml @@ -1,6 +1,8 @@ --- - name: Refresh Dock ansible.builtin.command: killall Dock + changed_when: true - name: Refresh Finder ansible.builtin.command: killall Finder + changed_when: true \ No newline at end of file From 71905251f98bf45ebc3a49d7015e66f078df721f Mon Sep 17 00:00:00 2001 From: Shotaro Kohama Date: Sun, 7 Jul 2024 22:04:48 -0700 Subject: [PATCH 8/8] Update homebrew packages and casks (take 8) --- roles/common/handlers/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml index b936a25..2f6dc3e 100644 --- a/roles/common/handlers/main.yml +++ b/roles/common/handlers/main.yml @@ -5,4 +5,4 @@ - name: Refresh Finder ansible.builtin.command: killall Finder - changed_when: true \ No newline at end of file + changed_when: true