diff --git a/.github/workflows/installer-ci.yml b/.github/workflows/installer-ci.yml index 1bdec334..1aaa5e74 100644 --- a/.github/workflows/installer-ci.yml +++ b/.github/workflows/installer-ci.yml @@ -224,6 +224,8 @@ jobs: exit $exit_code - name: Test Non-Interactive Installation + env: + CHEZMOI_GITHUB_ACCESS_TOKEN: ${{ github.token }} run: | echo "Testing installer in non-interactive mode..." @@ -277,6 +279,8 @@ jobs: fi - name: Test Interactive Installer + env: + CHEZMOI_GITHUB_ACCESS_TOKEN: ${{ github.token }} run: | echo "Testing installer in interactive mode with expect automation..." diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl index 2a267fde..f237c8cd 100644 --- a/dot_gitconfig.tmpl +++ b/dot_gitconfig.tmpl @@ -1,6 +1,6 @@ [include] path = {{ .chezmoi.homeDir }}/.config/git/common.gitconfig -{{- if (hasKey (default (dict) .gpg) "signing_key") }} +{{- if (hasKey (default (dict) (get . "gpg")) "signing_key") }} [user] signingkey = {{ .gpg.signing_key }} {{- end }} diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index a520d9ac..b2376b84 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -111,7 +111,7 @@ if command -v jfrog &>/dev/null; then fi # Setup custom aliases -{{ if (hasKey (default (dict) .gpg) "signing_key") -}} +{{ if (hasKey (default (dict) (get . "gpg")) "signing_key") -}} alias gpg-unlock='gpg --sign --local-user {{ .gpg.signing_key }} --output /dev/null /dev/null' {{- end }} diff --git a/installer/internal/config/compatibility.yaml b/installer/internal/config/compatibility.yaml index 119a1633..364adcda 100644 --- a/installer/internal/config/compatibility.yaml +++ b/installer/internal/config/compatibility.yaml @@ -32,6 +32,10 @@ operatingSystems: command: "git" description: "Git version control system" install_hint: "sudo apt-get install git" + - name: "jq" + command: "jq" + description: "JSON processor required to apply dotfiles and run agent hooks" + install_hint: "sudo apt-get install jq" debian: supported: true version_constraint: ">= 10" @@ -57,6 +61,10 @@ operatingSystems: command: "git" description: "Git version control system" install_hint: "sudo apt-get install git" + - name: "jq" + command: "jq" + description: "JSON processor required to apply dotfiles and run agent hooks" + install_hint: "sudo apt-get install jq" fedora: supported: true version_constraint: ">= 35" @@ -84,6 +92,10 @@ operatingSystems: command: "git" description: "Git version control system" install_hint: "sudo dnf install git" + - name: "jq" + command: "jq" + description: "JSON processor required to apply dotfiles and run agent hooks" + install_hint: "sudo dnf install jq" centos: supported: true notes: "CentOS 6 or newer" @@ -111,6 +123,10 @@ operatingSystems: command: "git" description: "Git version control system" install_hint: "sudo dnf install git" + - name: "jq" + command: "jq" + description: "JSON processor required to apply dotfiles and run agent hooks" + install_hint: "sudo dnf install jq" redhat: supported: true notes: "Red Hat Enterprise Linux 6 or newer" @@ -138,6 +154,10 @@ operatingSystems: command: "git" description: "Git version control system" install_hint: "sudo dnf install git" + - name: "jq" + command: "jq" + description: "JSON processor required to apply dotfiles and run agent hooks" + install_hint: "sudo dnf install jq" rocky: supported: false notes: "No current plans for support" @@ -164,6 +184,10 @@ operatingSystems: command: "git" description: "Git version control system (included with Command Line Tools)" install_hint: "Install Command Line Tools: xcode-select --install" + - name: "jq" + command: "jq" + description: "JSON processor required to apply dotfiles and run agent hooks" + install_hint: "brew install jq" windows: supported: false notes: "Windows is not supported" diff --git a/installer/internal/config/tools.yaml b/installer/internal/config/tools.yaml index 38b88ded..6d3b6f6d 100644 --- a/installer/internal/config/tools.yaml +++ b/installer/internal/config/tools.yaml @@ -13,7 +13,5 @@ tools: description: "Fast alternative to find" - name: difftastic description: "Structural diff tool" - - name: jq - description: "Lightweight command-line JSON processor" - name: uv description: "Fast Python package and project manager"