Skip to content
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ jobs:
- name: Install cargo-binstall
uses: cargo-bins/cargo-binstall@main

- name: Install selene
run: cargo binstall --no-confirm selene
- name: Install lint tools
run: cargo binstall --no-confirm ron-lsp selene

# The Lua type check is static, but .luarc.json points its library at the
# installed plenary/flash plugins, so make those paths exist. (No full
Expand Down
4 changes: 4 additions & 0 deletions dotfiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- "fzf"
- "zsh"
- "zellij"
- "wired"
- "nvim"
- "rust"
- "packages"
Expand Down Expand Up @@ -44,6 +45,9 @@
- role: zellij
tags:
- "zellij"
- role: wired
tags:
- "wired"
- role: wezterm
tags:
- "wezterm"
Expand Down
7 changes: 6 additions & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ test:
# Run the code linters: YAML (yamllint) + Ansible (ansible-lint) + Lua
# (lua-language-server + selene). Orthogonal to `check` (prek format/syntax
# hooks); CI runs both.
lint: lint-yaml lint-ansible lint-vim
lint: lint-yaml lint-ansible lint-ron lint-vim

# Lint RON configuration files.
lint-ron:
ron-lsp check roles/wired/files

# Lint YAML with yamllint (config: .yamllint).
lint-yaml DIR=".":
Expand All @@ -31,6 +35,7 @@ lint-yaml DIR=".":
# Lint the Ansible playbook and roles with ansible-lint (config: .ansible-lint).
lint-ansible:
uvx ansible-lint
ansible-playbook -i hosts dotfiles.yml --syntax-check

lint-vim:
just nvim lint
Expand Down
37 changes: 33 additions & 4 deletions roles/programming/tasks/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,49 @@
become_method: sudo
when: not ansible_check_mode and snap_bin.stat.exists and go_snap_missing

- name: Ensure APT keyrings directory exists
file:
path: /etc/apt/keyrings
state: directory
mode: "0755"
become: true
become_method: sudo

- name: Check for GitHub CLI GPG key
stat:
path: /etc/apt/keyrings/githubcli-archive-keyring.gpg
register: github_cli_key
changed_when: false

- name: Download GitHub CLI GPG key
get_url:
url: https://cli.github.com/packages/githubcli-archive-keyring.gpg
dest: /usr/share/keyrings/githubcli-archive-keyring.gpg
dest: /etc/apt/keyrings/githubcli-archive-keyring.gpg
mode: "0644"
become: true
become_method: sudo
when: not ansible_check_mode and not github_cli_key.stat.exists

- name: Remove obsolete GitHub CLI list repository
file:
path: /etc/apt/sources.list.d/github-cli.list
state: absent
become: true
become_method: sudo
when: not ansible_check_mode

- name: Add GitHub CLI apt repository
apt_repository:
repo: "deb [arch=amd64 signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main"
deb822_repository:
name: github-cli
types: deb
uris: https://cli.github.com/packages/
suites: stable
components:
- main
architectures:
- amd64
signed_by: /etc/apt/keyrings/githubcli-archive-keyring.gpg
state: present
filename: github-cli
become: true
become_method: sudo
when: not ansible_check_mode
Expand Down
2 changes: 2 additions & 0 deletions roles/programming/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
exe: bat
- name: ripgrep
exe: rg
- name: ron-lsp
exe: ron-lsp
- name: zoxide
exe: zoxide
when: not ansible_check_mode
Expand Down
Loading
Loading