Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates on Jul 7, 2024 #43

Merged
merged 8 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions requirements.dev.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
yamllint==1.26.3
ansible==4.8.0
ansible-lint==5.3.2
yamllint==1.35.1
ansible==10.1.0
ansible-lint==24.6.1
6 changes: 4 additions & 2 deletions roles/common/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
- name: Refresh Dock
command: killall Dock
ansible.builtin.command: killall Dock
changed_when: true

- name: Refresh Finder
command: killall Finder
ansible.builtin.command: killall Finder
changed_when: true
2 changes: 1 addition & 1 deletion roles/common/tasks/homebrew-cask.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion roles/common/tasks/homebrew.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- name: Install brew packages
community.general.homebrew:
name: "{{ item }}"
loop: "{{ homebrew_packages }}"
loop: "{{ common_homebrew_packages }}"
tags: brew
15 changes: 10 additions & 5 deletions roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
---
- import_tasks: homebrew.yml
- import_tasks: homebrew-cask.yml
- import_tasks: oh-my-zsh.yml
- import_tasks: dotfiles.yml
- 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
9 changes: 3 additions & 6 deletions roles/common/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
homebrew_packages:
common_homebrew_packages:
- act
- ag
- ansible
- asdf
- aspell
- autojump
- awscli
Expand Down Expand Up @@ -39,13 +40,9 @@ homebrew_packages:
- watch
- wget

homebrew_cask_packages:
common_homebrew_cask_packages:
- 1password
- alfred
- bartender
- discord
- docker
- dropbox
- google-chrome
- google-cloud-sdk
- grammarly
Expand Down
8 changes: 4 additions & 4 deletions roles/gitconfig/tasks/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
6 changes: 4 additions & 2 deletions roles/gitconfig/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions roles/gitconfig/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
gitname: Shotaro Kohama
gitmail: [email protected]
editor: emacs
excludes_path: "{{ lookup('env', 'HOME') }}/.gitexcludesfile"
gitconfig_gitname: Shotaro Kohama
gitconfig_gitmail: [email protected]
gitconfig_editor: emacs
gitconfig_excludes_path: "{{ lookup('env', 'HOME') }}/.gitexcludesfile"
Loading