Skip to content

Commit

Permalink
Some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiashamacher authored Sep 23, 2024
1 parent 25aee73 commit fbfb060
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 11 deletions.
3 changes: 3 additions & 0 deletions bin/dotfiles
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ function darwin_setup() {
if ! [ -x "$(command -v brew)" ]; then
_task "Installing Homebrew"
_cmd '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"'
_cmd "echo 'eval $(/opt/homebrew/bin/brew shellenv)' >> /Users/matthiashamacher/.zprofile"
_cmd 'eval $(/opt/homebrew/bin/brew shellenv)'
_cmd 'brew doctor'
fi
if ! [ -x "$(command -v ansible)" ]; then
_task "Installing Ansible"
Expand Down
2 changes: 1 addition & 1 deletion roles/git/tasks/git-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
community.general.git_config:
name: gpg.program
scope: global
value: /usr/local/bin/gpg
value: /opt/homebrew/bin/gpg

- name: "Git | .gitconfig | Set gpg.format"
community.general.git_config:
Expand Down
2 changes: 1 addition & 1 deletion roles/gnupg/files/gpg-agent.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pinentry-program /usr/local/bin/pinentry-mac
pinentry-program /opt/homebrew/bin/pinentry-mac
enable-ssh-support
7 changes: 0 additions & 7 deletions roles/gnupg/handlers/main.yml

This file was deleted.

6 changes: 4 additions & 2 deletions roles/gnupg/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
src: gpg-agent.conf
dest: "{{ ansible_user_dir }}/.gnupg/gpg-agent.conf"
mode: "0600"
notify:
- Restart gpg agent

- name: Restart gpg agent

Check failure on line 24 in roles/gnupg/tasks/main.yml

View workflow job for this annotation

GitHub Actions / Lint

no-changed-when

Commands should not change things if nothing needs doing.
ansible.builtin.command:
cmd: gpgconf --reload gpg-agent

- name: "Gnupg | Check for keys"
ansible.builtin.command: gpg --list-keys
Expand Down

0 comments on commit fbfb060

Please sign in to comment.