Update 8 files

- /home/.chezmoiscripts/universal/run_onchange_after_24-vpn-darwin.tmpl
- /home/.chezmoiscripts/universal/run_onchange_after_14-warp.tmpl
- /home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.tmpl
- /home/.chezmoiscripts/universal/run_onchange_after_14-install-aqua-packages.tmpl
- /home/.chezmoiscripts/universal/run_onchange_after_40-chrome.tmpl
- /home/.chezmoiscripts/universal/run_onchange_after_40-firefox.tmpl
- /home/dot_config/aqua/aqua.yaml
- /software.yml
This commit is contained in:
Brian Zalewski 2023-03-27 06:57:26 +00:00
parent cd1462487c
commit 645061d191
8 changed files with 32 additions and 20 deletions

View file

@ -1,23 +1,13 @@
{{- if false }}
#!/usr/bin/env bash #!/usr/bin/env bash
set -eufo pipefail
{{ includeTemplate "universal/profile" }} {{ includeTemplate "universal/profile" }}
{{ includeTemplate "universal/logg" }} {{ includeTemplate "universal/logg" }}
{{- $files := list -}} if command -v aqua > /dev/null; then
{{- range $path := glob (list .chezmoi.sourceDir "private_dot_config/aqua/**/*.yaml.tmpl" | join "/") }} logg info 'Updating Aqua'
{{- $files = concat $files (list (include $path)) -}} aqua update-aqua
{{- end }} logg info 'Installing Aqua dependencies (if any are defined)'
# aqua.yaml.tmpl hash: {{ $files | join "" | sha256sum }} aqua install -a
if ! command -v aqua >/dev/null 2>&1; then else
logg info 'Installing Aqua' logg info 'Skipping aqua install script because aqua was not installed'
curl -sSfL https://raw.githubusercontent.com/aquaproj/aqua-installer/v1.0.0/aqua-installer | bash
fi fi
logg info 'Updating Aqua'
aqua update-aqua
logg info 'Installing Aqua dependencies (if any are defined)'
aqua install -a
{{ end -}}

View file

@ -1,6 +1,9 @@
{{- if (ne .host.distro.family "windows") -}} {{- if (ne .host.distro.family "windows") -}}
#!/usr/bin/env bash #!/usr/bin/env bash
{{ includeTemplate "universal/profile" }}
{{ includeTemplate "universal/logg" }}
### Configure CloudFlare WARP (if not WSL and warp-cli is installed) ### Configure CloudFlare WARP (if not WSL and warp-cli is installed)
if [[ ! "$(test -d /proc && grep Microsoft /proc/version > /dev/null)" ]] && command -v warp-cli > /dev/null; then if [[ ! "$(test -d /proc && grep Microsoft /proc/version > /dev/null)" ]] && command -v warp-cli > /dev/null; then
### Register CloudFlare WARP ### Register CloudFlare WARP

View file

@ -1,4 +1,4 @@
{{- if eq .host.distro.family "darwin" -}} {{- if (eq .host.distro.family "darwin") -}}
#!/usr/bin/env bash #!/usr/bin/env bash
{{ includeTemplate "universal/profile" }} {{ includeTemplate "universal/profile" }}

View file

@ -24,7 +24,7 @@ for POLICY_DIR in "/opt/google/chrome/policies" "/etc/chromium/policies" "/etc/b
done done
### Add Chrome extension JSON ### Add Chrome extension JSON
for EXTENSION_DIR in "/opt/google/chrome/extensions" "/etc/chromium/extensions" "/etc/brave/extensions" "$HOME/Library/Application Support/Google/Chrome/External Extensions" "$HOME/Library/Application Support/Microsoft/Edge/External Extensions" "$HOME/Library/Application Support/BraveSoftware/Brave-Browser/External Extensions" ; do for EXTENSION_DIR in "/opt/google/chrome/extensions" "/etc/chromium/extensions" "/etc/brave/extensions" "$HOME/Library/Application Support/Google/Chrome/External Extensions" "$HOME/Library/Application Support/Microsoft/Edge/External Extensions" "$HOME/Library/Application Support/BraveSoftware/Brave-Browser/External Extensions"; do
### Ensure program-type is installed ### Ensure program-type is installed
if [ -d "$(dirname "$EXTENSION_DIR")" ]; then if [ -d "$(dirname "$EXTENSION_DIR")" ]; then
### Ensure extension directory exists ### Ensure extension directory exists

View file

@ -5,7 +5,6 @@
{{ includeTemplate "universal/logg" }} {{ includeTemplate "universal/logg" }}
# Firefox plugins: {{ list (.firefoxAddOns | toString | replace "[" "" | replace "]" "") | uniq | join " " }} # Firefox plugins: {{ list (.firefoxAddOns | toString | replace "[" "" | replace "]" "") | uniq | join " " }}
#
### Installs the Firefox Profile Connector on Linux systems (Snap / Flatpak installs are not included in this function, but instead inline below) ### Installs the Firefox Profile Connector on Linux systems (Snap / Flatpak installs are not included in this function, but instead inline below)
function installFirefoxProfileConnector() { function installFirefoxProfileConnector() {

View file

@ -18,6 +18,13 @@ COMPLETION_DIR="$HOME/.local/share/bash-completion/completions"
mkdir -p "$COMPLETION_DIR" mkdir -p "$COMPLETION_DIR"
FALLBACK_URL="https://gitlab.com/megabyte-labs/misc/dotfiles/-/raw/master/dotfiles/.local/share/bash-completion/completions" FALLBACK_URL="https://gitlab.com/megabyte-labs/misc/dotfiles/-/raw/master/dotfiles/.local/share/bash-completion/completions"
### Aqua
if command -v aqua &> /dev/null; then
aqua completion bash > "$COMPLETION_DIR/aqua.bash"
elif [ -f "$COMPLETION_DIR/aqua.bash" ]; then
rm "$COMPLETION_DIR/aqua.bash"
fi
### Deno ### Deno
if command -v deno > /dev/null; then if command -v deno > /dev/null; then
deno completions bash > "$COMPLETION_DIR/deno.bash" deno completions bash > "$COMPLETION_DIR/deno.bash"

View file

@ -0,0 +1,12 @@
---
# aqua - Declarative CLI Version Manager
# https://aquaproj.github.io/
# checksum:
# # https://aquaproj.github.io/docs/reference/checksum/
# enabled: true
# require_checksum: true
registries:
- type: standard
ref: v3.149.0 # renovate: depName=aquaproj/aqua-registry
packages:
- name: google/yamlfmt@v0.8.0

View file

@ -483,6 +483,7 @@ softwarePackages:
brew: aquaproj/aqua/aqua brew: aquaproj/aqua/aqua
binary:linux: https://github.com/aquaproj/aqua/releases/download/v2.0.0-0/aqua_linux_amd64.tar.gz binary:linux: https://github.com/aquaproj/aqua/releases/download/v2.0.0-0/aqua_linux_amd64.tar.gz
binary:windows: https://github.com/aquaproj/aqua/releases/download/v2.0.0-0/aqua_windows_amd64.tar.gz binary:windows: https://github.com/aquaproj/aqua/releases/download/v2.0.0-0/aqua_windows_amd64.tar.gz
go: github.com/aquaproj/aqua/v2/cmd/aqua@latest
_type: cli _type: cli
argo-cli: argo-cli:
_bin: argocd _bin: argocd