Skip to content

Commit 020a1b0

Browse files
committed
Update Ansible tasks
1 parent f6b2333 commit 020a1b0

File tree

17 files changed

+438
-233
lines changed

17 files changed

+438
-233
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
run: ansible-playbook --syntax-check --list-tasks ansible/dotfiles.yml
2626

2727
- name: Run Playbook
28-
run: ansible-playbook ansible/dotfiles.yml --skip-tags "packages,dnscrypt"
28+
run: ansible-playbook ansible/dotfiles.yml --skip-tags "packages"
2929

3030
- name: Check if Playbook is idempotent
3131
run: |
32-
ansible-playbook ansible/dotfiles.yml --skip-tags "packages,dnscrypt" | grep -q 'changed=0.*failed=0' && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1)
32+
ansible-playbook ansible/dotfiles.yml --skip-tags "packages" | grep -q 'changed=0.*failed=0' && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1)
3333
3434
- name: Debugging Checks
3535
if: ${{ !cancelled() }}

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ These are my dotfiles, they can be used under macOS and Linux (mainly Arch Linux
1010
* Try to use consistent color theme and fonts between all components
1111
* set some macOS defaults (`dotfiles/ansible/tasks/macos_defaults.yml`)
1212
* set some Arch Linux specific options (`dotfiles/ansible/tasks/arch.yml`)
13-
* dnscrypt for encrypted and locally cached DNS queries (macOS only)
1413
* try to keep `~/` clean
1514
* configuration is mainly handled by Ansible (playbook: `~/.dotfiles/ansible/dotfiles.yml`)
1615

@@ -55,8 +54,7 @@ $ ./setup.sh
5554
│   ├── vars
5655
│   │   ├── casks.yml
5756
│   │   ├── formula.yml
58-
│   │   ├── gems.yml
59-
│   │   ├── pip.yml
57+
│   │   ├── mas.yml
6058
│   │   └── taps.yml
6159
│   └── vars.yml
6260
└── init
@@ -67,7 +65,6 @@ $ ./setup.sh
6765

6866
* `login_shell: /opt/homebrew/bin/fish`
6967
* `sudo_without_password: true`
70-
* `use_dnscrypt: true` install and configure [DNSCrypt](https://dnscrypt.org/)
7168
* `login_window_text: Enter any 11-digit prime number to continue.` set a custom message to appear at the bottom of your login window (macOS)
7269

7370
* Clone and install dotfiles repository:

aliases

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ alias grep='grep --color=auto'
77
alias tree="tree -C"
88

99
# Update Homebrew formulas and casks
10-
alias update='brew update && brew upgrade; brew cleanup; git -C ~/.dotfiles pull'
10+
alias update='brew update && brew upgrade; brew cleanup; mas upgrade; git -C ~/.dotfiles pull'
1111

1212
# Enhanced WHOIS lookups
1313
alias whois="whois -h whois-servers.net"
@@ -35,7 +35,7 @@ alias mergepdf='/System/Library/Automator/Combine\ PDF\ Pages.action/Contents/Re
3535
alias badge="tput bel"
3636

3737
# Lock the screen (when going AFK)
38-
alias afk="/System/Library/CoreServices/Menu\ Extras/User.menu/Contents/Resources/CGSession -suspend"
38+
alias afk="pmset displaysleepnow"
3939

4040
# Copy my public key to the pasteboard
4141
alias pubkey="more ~/.ssh/id_ed25519.pub | pbcopy | printf '=> Public key copied to pasteboard.\n'"

ansible/dotfiles.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
dest: /etc/sudoers
1919
state: present
2020
line: "{{ ansible_user_id }} ALL=NOPASSWD: ALL"
21-
insertafter: '^%admin\tALL=\(ALL\) ALL'
21+
insertafter: '^%admin\tALL=\(ALL\) ALL'
2222
validate: "visudo -cf %s"
23-
become: yes
23+
become: true
2424
when: sudo_without_password and ansible_os_family == "Darwin"
2525

2626
- name: Enable tty_tickets
@@ -29,7 +29,7 @@
2929
state: present
3030
line: "Defaults tty_tickets"
3131
validate: "visudo -cf %s"
32-
become: yes
32+
become: true
3333
when: ansible_os_family == "Darwin"
3434

3535
- name: Install oh-my-zsh
@@ -91,13 +91,6 @@
9191
tags:
9292
- packages
9393

94-
- name: Install oh-my-fish themes and plugins
95-
command: fish -c "omf install"
96-
args:
97-
creates: ~/.local/share/omf/themes/default/
98-
tags:
99-
- packages
100-
10194
- name: Install iTerm 2 shell integrations
10295
get_url:
10396
url: https://iterm2.com/shell_integration/{{item}}
@@ -127,11 +120,6 @@
127120
tags:
128121
- arch
129122

130-
- include_tasks: tasks/dnscrypt.yml
131-
when: use_dnscrypt and ansible_os_family == "Darwin"
132-
tags:
133-
- dnscrypt
134-
135123
handlers:
136124
- name: Kill Dock
137125
command: killall Dock

ansible/tasks/dnscrypt.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)