fix: no nested chezmoi data, install rbw to auto-fetch password, install rbw with github

Author: tmeijn

chezmoi/.chezmoi.toml.tmpl

@@ -11,12 +11,12 @@ args = [
 pager = "diffnav"
 {{ end }}
 
-{{- $full_name := promptStringOnce .git "name" "Full Name" -}}
-{{- $email := promptStringOnce .git "email" "email" -}}
-{{- $email_work := promptStringOnce .git "email_work" "Work Email" -}}
+{{- $full_name := promptString "name" "Full Name" -}}
+{{- $email := promptString "email" "email" -}}
+{{- $email_work := promptString "email_work" "Work Email" -}}
 
 
-[data.git]
+[data]
 	email = {{ $email | quote }}
 	name = {{ $full_name | quote }}
 	email_work = {{ $email_work | quote }}

chezmoi/.chezmoiscripts/run_once_after_20_install-aqua-and-tools.sh

@@ -15,6 +15,3 @@ export AQUA_ROOT_DIR="${XDG_DATA_HOME:-$HOME/.local/share/aquaproj-aqua}"
 export PATH="${AQUA_ROOT_DIR}/bin:$PATH"
 export AQUA_GLOBAL_CONFIG=${AQUA_GLOBAL_CONFIG:-${XDG_CONFIG_HOME:-$HOME/.config}/aquaproj-aqua/aqua.yaml}
 export AQUA_GENERATE_WITH_DETAIL=true
-
-echo "Installing global tools with Aqua..."
-aqua install --all

chezmoi/.chezmoiscripts/run_once_after_22_install-core-dependencies.sh.tmpl

@@ -17,15 +17,16 @@ sudo apt-get install -qq -y make build-essential libssl-dev zlib1g-dev \
   libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm \
   libncurses-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev
 
-echo "Installing Git as Mise needs that as dependency"
+echo "Installing Git as Mise needs that as dependency..."
 sudo apt install git -y
 
-
+echo "Installing Python with Mise to enable Ansible Run..."
 mise install python
-mise install pipx
-mise install pipx:ansible[pipx_args="--include-deps"]
+mise install uv
+mise install pipx:ansible[uvx_args="--with-executables-from ansible-core,ansible-lint"]
 
 echo "Initializing mise..."
 eval "$(mise env -s bash)"
 
+echo "Running Ansible Playbook for core packages..."
 ansible-playbook -v {{ joinPath .chezmoi.sourceDir "ansible/setup.yaml" | quote }} --tags core-packages

chezmoi/.chezmoiscripts/run_once_after_30_install-tools-with-mise-and-aqua.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env -S bash
+
+echo ""
+echo "==============================================================="
+echo ""
+echo "Installing tools managed by Mise & Aqua"
+echo ""
+echo "==============================================================="
+echo ""
+
+echo "Installing rbw..."
+mise use aqua:doy/rbw
+
+echo "Logging into Bitwarden..."
+rbw login
+
+echo "Setting GitHub token fetched from Bitwarden..."
+GITHUB_TOKEN="$(rbw get GITHUB_TOKEN)"
+export GITHUB_TOKEN
+
+echo "Installing global tools with Aqua..."
+aqua install --all
+
+echo "Installing global tools managed with Mise..."
+mise install --yes

chezmoi/.chezmoiscripts/run_once_after_30_install-tools-with-mise.sh

@@ -35,7 +35,7 @@
           when: ansible_architecture == 'aarch64'
 
     - name: Install core packages
-      include_tasks:
+      ansible.builtin.include_tasks:
         file: tasks/install_core_packages.yaml
         apply:
           tags: [core-packages]
@@ -84,20 +84,21 @@
           - gstreamer1.0-icamera
         update_cache: true
 
-
-
     - name: "[BLOCK] Setting up DisplayLink drivers"
       block:
         - name: Download Synaptics repository keyring package
-          get_url:
+          ansible.builtin.get_url:
             url: "{{ synaptics_package_url }}"
             dest: "{{ synaptics_package_path }}"
             mode: '0644'
+        # Remove the standalone DisplayLink driver if it was previously installed on the system.
+        # This task ensures a clean state before installing a newer version or alternative display driver,
+        # preventing conflicts between multiple DisplayLink installations.
         - name: Remove standalone DisplayLink driver (if present)
           ansible.builtin.apt:
             name: displaylink
             state: absent
-          ignore_errors: true
+          failed_when: false
 
         - name: Install Synaptics APT Repository keyring
           ansible.builtin.apt:
@@ -233,12 +234,12 @@
             groups: docker
             append: true
         - name: Ensure /etc/docker directory exists
-          file:
+          ansible.builtin.file:
             path: /etc/docker
             state: directory
             mode: '0755'
         - name: Copy Docker daemon configuration
-          copy:
+          ansible.builtin.copy:
             content: "{{ docker_config | to_nice_json }}"
             dest: /etc/docker/daemon.json
             mode: '0644'
@@ -257,6 +258,7 @@
           ansible.builtin.get_url:
             url: https://pkgs.zabbly.com/key.asc
             dest: /etc/apt/keyrings/zabbly.asc
+            mode: '0644'
         # NOTE: hardcoded to noble as Incus does not do non-LTS releases
         - name: Add Incus repository file
           ansible.builtin.copy:
@@ -317,7 +319,7 @@
         nerd_fonts_base_url: "https://github.com/ryanoasis/nerd-fonts/releases/latest/download"
       block:
         - name: Ensure fonts directory exists
-          file:
+          ansible.builtin.file:
             path: "{{ nerd_fonts_dir }}"
             state: directory
             mode: '0755'

chezmoi/ansible/setup.yaml

@@ -1,2 +1,2 @@
 [user]
-	email = {{ .git.email_work | quote }}
+	email = {{ .email_work | quote }}

chezmoi/dot_config/git/config-knmi.tmpl

@@ -49,8 +49,8 @@
 	credentialsInUrl = "warn"
 
 [user]
-	email = "{{ .git.email }}"
-	name = "{{ .git.name }}"
+	email = "{{ .email }}"
+	name = "{{ .name }}"
 	signingkey = "~/.ssh/id_ed25519"
 
 [git-town]

chezmoi/dot_config/git/config.tmpl

@@ -42,7 +42,6 @@ pipx = "latest"
 "cargo:lstr" = "0.2.1"
 "cargo:mergiraf" = "0.16.3"
 "cargo:onefetch" = "2.26.1"
-"cargo:rbw" = "1.15.0"
 "cargo:so" = "0.4.10"
 "cargo:soptikha2/desed" = "tag:v1.2.2"
 "cargo:zeitfetch" = "0.1.16"
@@ -64,6 +63,7 @@ pipx = "latest"
 "github:aws-cloudformation/rain" = "1.24.2"
 "github:blacknon/hwatch" = "0.3.19"
 "github:bluetuith-org/bluetuith" = "0.2.6"
+"github:doy/rbw" = "1.15.0"
 "github:ekzhang/bore" = "0.6.0"
 "github:eugene-babichenko/fixit" = "0.11.0"
 "github:fioncat/otree" = "0.6.4"