diff --git a/docs/TODO.md b/docs/TODO.md index 387c402c..bb73c9ba 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -177,6 +177,7 @@ https://github.com/rigoneri/Syte3 * https://github.com/charmbracelet/skate * https://github.com/console-rs/indicatif * https://github.com/tauri-apps/tauri +* https://github.com/emilengler/sysget ## PHP diff --git a/home/.chezmoiscripts/universal/run_before_02-decrypt-age-key.sh.tmpl b/home/.chezmoiscripts/universal/run_before_02-decrypt-age-key.sh.tmpl index ec6c2e77..d71e50c1 100644 --- a/home/.chezmoiscripts/universal/run_before_02-decrypt-age-key.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_before_02-decrypt-age-key.sh.tmpl @@ -45,7 +45,7 @@ decryptionFailure() { ### Install Age via Homebrew if not present installAge() { - if command -v brew > /dev/null; then + if ! command -v brew > /dev/null; then logg info 'Running `brew install age`' brew install age else @@ -55,7 +55,7 @@ installAge() { ### Install Expect via Homebrew if not present installExpect() { - if command -v brew > /dev/null; then + if ! command -v brew > /dev/null; then logg info 'Running `brew install expect`' brew install expect else diff --git a/home/.chezmoiscripts/universal/run_onchange_after_45-default-browser.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_45-default-browser.sh.tmpl index d8475a16..52574cc8 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_45-default-browser.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_45-default-browser.sh.tmpl @@ -32,3 +32,4 @@ else logg info 'Setting default browser with `xdg-settings` to `{{ .user.defaultBrowser }}`' xdg-settings set default-web-browser {{ .user.defaultBrowser }}.desktop fi +{{ end -}} diff --git a/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.sh.tmpl index 300da069..72c27864 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.sh.tmpl @@ -26,35 +26,35 @@ mkdir -p "$COMPLETION_DIR" 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" + rm -f "$COMPLETION_DIR/aqua.bash" fi ### Deno if command -v deno > /dev/null; then deno completions bash > "$COMPLETION_DIR/deno.bash" elif [ -f "$COMPLETION_DIR/deno.bash" ]; then - rm "$COMPLETION_DIR/deno.bash" + rm -f "$COMPLETION_DIR/deno.bash" fi ### direnv if command -v direnv > /dev/null; then direnv hook bash > "$COMPLETION_DIR/direnv.bash" elif [ -f "$COMPLETION_DIR/direnv.bash" ]; then - rm "$COMPLETION_DIR/direnv.bash" + rm -f "$COMPLETION_DIR/direnv.bash" fi ### fd if command -v fd > /dev/null && command -v brew > /dev/null && [ -f "$(brew --prefix fd)/etc/bash_completion.d/fd" ]; then cp "$(brew --prefix fd)/etc/bash_completion.d/fd" "$COMPLETION_DIR/fd.bash" elif [ -f "$COMPLETION_DIR/fd.bash" ]; then - rm "$COMPLETION_DIR/fd.bash" + rm -f "$COMPLETION_DIR/fd.bash" fi ### fig if command -v fig > /dev/null; then fig completion bash > "$COMPLETION_DIR/fig.bash" elif [ -f "$COMPLETION_DIR/fig.bash" ]; then - rm "$COMPLETION_DIR/fig.bash" + rm -f "$COMPLETION_DIR/fig.bash" fi ### fzf @@ -62,50 +62,50 @@ if command -v fzf > /dev/null && command -v brew > /dev/null && [ -f "$(brew --p cp "$(brew --prefix fzf)/shell/completion.bash" "$COMPLETION_DIR/fzf.bash" cp "$(brew --prefix fzf)/shell/key-bindings.bash" "$COMPLETION_DIR/fzf-key-bindings.bash" elif [ -f "$COMPLETION_DIR/fzf.bash" ]; then - rm "$COMPLETION_DIR/fzf.bash" - rm "$COMPLETION_DIR/fzf-key-bindings.bash" + rm -f "$COMPLETION_DIR/fzf.bash" + rm -f "$COMPLETION_DIR/fzf-key-bindings.bash" fi ### gh if command -v gh > /dev/null; then gh completion -s bash > "$COMPLETION_DIR/gh.bash" elif [ -f "$COMPLETION_DIR/gh.bash" ]; then - rm "$COMPLETION_DIR/gh.bash" + rm -f "$COMPLETION_DIR/gh.bash" fi ### Googler if command -v googler > /dev/null && command -v brew > /dev/null && [ -f "$(brew --prefix googler)/etc/bash_completion.d/googler-completion.bash" ]; then cp "$(brew --prefix googler)/etc/bash_completion.d/googler-completion.bash" "$COMPLETION_DIR/googler.bash" elif [ -f "$COMPLETION_DIR/googler.bash" ]; then - rm "$COMPLETION_DIR/googler.bash" + rm -f "$COMPLETION_DIR/googler.bash" fi ### Gradle if command -v gradle > /dev/null; then curl -sSL https://raw.githubusercontent.com/eriwen/gradle-completion/master/gradle-completion.bash > "$COMPLETION_DIR/gradle.bash" elif [ -f "$COMPLETION_DIR/gradle.bash" ]; then - rm "$COMPLETION_DIR/gradle.bash" + rm -f "$COMPLETION_DIR/gradle.bash" fi ### Helm if command -v helm > /dev/null; then helm completion bash > "$COMPLETION_DIR/helm.bash" elif [ -f "$COMPLETION_DIR/helm.bash" ]; then - rm "$COMPLETION_DIR/helm.bash" + rm -f "$COMPLETION_DIR/helm.bash" fi ### Hyperfine if command -v hyperfine > /dev/null && command -v brew > /dev/null && [ -f "$(brew --prefix hyperfine)/etc/bash_completion.d/hyperfine.bash" ]; then cp "$(brew --prefix hyperfine)/etc/bash_completion.d/hyperfine.bash" "$COMPLETION_DIR/hyperfine.bash" elif [ -f "$COMPLETION_DIR/hyperfine.bash" ]; then - rm "$COMPLETION_DIR/hyperfine.bash" + rm -f "$COMPLETION_DIR/hyperfine.bash" fi ### kubectl if command -v kubectl > /dev/null; then kubectl completion bash > "$COMPLETION_DIR/kubectl.bash" elif [ -f "$COMPLETION_DIR/kubectl.bash" ]; then - rm "$COMPLETION_DIR/kubectl.bash" + rm -f "$COMPLETION_DIR/kubectl.bash" fi ### mcfly @@ -113,77 +113,84 @@ export MCFLY_KEY_SCHEME=vim if command -v mcfly > /dev/null; then mcfly init bash > "$COMPLETION_DIR/mcfly.bash" elif [ -f "$COMPLETION_DIR/mcfly.bash" ]; then - rm "$COMPLETION_DIR/mcfly.bash" + rm -f "$COMPLETION_DIR/mcfly.bash" fi ### nb if command -v nb > /dev/null && command -v brew > /dev/null && [ -f "$(brew --prefix nb)/etc/bash_completion.d/nb.bash" ]; then cp "$(brew --prefix nb)/etc/bash_completion.d/nb.bash" "$COMPLETION_DIR/nb.bash" elif [ -f "$COMPLETION_DIR/nb.bash" ]; then - rm "$COMPLETION_DIR/nb.bash" + rm -f "$COMPLETION_DIR/nb.bash" +fi + +### Ngrok +if command -v ngrok > /dev/null; then + ngrok completion > "$COMPLETION_DIR/ngrok.bash" +elif [ -f "$COMPLETION_DIR/ngrok.bash" ]; then + rm -f "$COMPLETION_DIR/ngrok.bash" fi ### nnn if command -v nnn > /dev/null && command -v brew > /dev/null && [ -f "$(brew --prefix nnn)/etc/bash_completion.d/nnn-completion.bash" ]; then cp "$(brew --prefix nnn)/etc/bash_completion.d/nnn-completion.bash" "$COMPLETION_DIR/nnn.bash" elif [ -f "$COMPLETION_DIR/nnn.bash" ]; then - rm "$COMPLETION_DIR/nnn.bash" + rm -f "$COMPLETION_DIR/nnn.bash" fi ### npm if command -v npm > /dev/null; then npm completion > "$COMPLETION_DIR/npm.bash" elif [ -f "$COMPLETION_DIR/npm.bash" ]; then - rm "$COMPLETION_DIR/npm.bash" + rm -f "$COMPLETION_DIR/npm.bash" fi ### Please if command -v plz > /dev/null; then plz --completion_script > "$COMPLETION_DIR/please.bash" elif [ -f "$COMPLETION_DIR/please.bash" ]; then - rm "$COMPLETION_DIR/please.bash" + rm -f "$COMPLETION_DIR/please.bash" fi ### Portal if command -v portal > /dev/null; then portal completion bash > "$COMPLETION_DIR/portal.bash" elif [ -f "$COMPLETION_DIR/portal.bash" ]; then - rm "$COMPLETION_DIR/portal.bash" + rm -f "$COMPLETION_DIR/portal.bash" fi ### Poetry if command -v poetry > /dev/null; then poetry completions bash > "$COMPLETION_DIR/poetry.bash" elif [ -f "$COMPLETION_DIR/poetry.bash" ]; then - rm "$COMPLETION_DIR/poetry.bash" + rm -f "$COMPLETION_DIR/poetry.bash" fi ### Sake if command -v sake > /dev/null; then sake completion bash > "$COMPLETION_DIR/sake.bash" elif [ -f "$COMPLETION_DIR/sake.bash" ]; then - rm "$COMPLETION_DIR/sake.bash" + rm -f "$COMPLETION_DIR/sake.bash" fi ### Volta if command -v volta > /dev/null; then volta completions bash > "$COMPLETION_DIR/volta.bash" elif [ -f "$COMPLETION_DIR/volta.bash" ]; then - rm "$COMPLETION_DIR/volta.bash" + rm -f "$COMPLETION_DIR/volta.bash" fi ### wp-cli (only bash available) if command -v wp > /dev/null; then curl -sSL https://raw.githubusercontent.com/wp-cli/wp-cli/v2.7.1/utils/wp-completion.bash > "$COMPLETION_DIR/wp.bash" elif [ -f "$COMPLETION_DIR/wp.bash" ]; then - rm "$COMPLETION_DIR/wp.bash" + rm -f "$COMPLETION_DIR/wp.bash" fi ### zoxide if command -v zoxide >/dev/null; then zoxide init bash > "$COMPLETION_DIR/zoxide.bash" elif [ -f "$COMPLETION_DIR/zoxide.bash" ]; then - rm "$COMPLETION_DIR/zoxide.bash" + rm -f "$COMPLETION_DIR/zoxide.bash" fi {{ end -}} diff --git a/home/.chezmoitemplates/secrets/WAKATIME_API_KEY b/home/.chezmoitemplates/secrets/WAKATIME_API_KEY index 97078d28..7adc990b 100644 --- a/home/.chezmoitemplates/secrets/WAKATIME_API_KEY +++ b/home/.chezmoitemplates/secrets/WAKATIME_API_KEY @@ -1,8 +1,8 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtaEFzNURGQU82Q3dhK09M -Zy9CQ3NJV04wN05OenkzVVV6T3VmKy9PdnlnCmNDUFVtUTYxZ2h1OVFvM2xtQXIr -My9qbzNLNmk1V0tKSlkzVjBqMklaUG8KLS0tIDI4ZnNqNUFYdks0QURjVGd2cW0y -bzdSL2QyUlVjMVcvdFI1OTdHL21yUkUKSncR0A7+wtIWGYPa37qWbd66hjukM46Y -XgD3o2iXKvKwiYyfUbw6s7Il+Hz5VQhi6w2603zVLgJOxMJ5/NaCBHeA6IrSzOWU -ip8= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxNCtjVThweVZoOFVMbk9L +OEsza1BHQVp1bFhUVVhwN1VEektIOHNxRTBJCjZrUEJmL0ZHL2daWEx4a2NtTjgr +VE5uak16L1ZJWkg0YmVzd0ZsWXJBVG8KLS0tIEx5OGdmVXR2T2pnZkJ5cTRWcWc0 +R0dYeG05WGJUNFdHSDlPQ2hvVlNSYmcKn0V2OQBIvhXmyvy69e/hpfCVHDXVFYyW +z125LvJO4ssiR6tbrsxymSjXjfWiwIhWvLBN+ZLuP7gLB7BBdm18jpUxiGtfcH9r +uFM= -----END AGE ENCRYPTED FILE----- \ No newline at end of file diff --git a/home/dot_config/shell/exports.sh.tmpl b/home/dot_config/shell/exports.sh.tmpl index f12d5c58..9005a696 100644 --- a/home/dot_config/shell/exports.sh.tmpl +++ b/home/dot_config/shell/exports.sh.tmpl @@ -248,6 +248,11 @@ export MCFLY_KEY_SCHEME=vim ### minikube export MINIKUBE_HOME="$XDG_DATA_HOME/minikube" +### Monero +if [ -f /Applications/monero-wallet-gui.app/Contents/MacOS/monerod ]; then + export PATH="$PATH:/Applications/monero-wallet-gui.app/Contents/MacOS" +fi + ### MySQL export MYSQL_HISTFILE="$XDG_DATA_HOME/mysql_history" diff --git a/software.yml b/software.yml index 34fd1cb6..e1d99711 100644 --- a/software.yml +++ b/software.yml @@ -1570,6 +1570,7 @@ softwarePackages: _github: https://github.com/kelseyhightower/confd _home: null _name: confd + _service: consul _type: cli brew: confd choco: confd @@ -2689,7 +2690,7 @@ softwarePackages: _github: https://github.com/chrissimpkins/Crunch _home: https://github.com/chrissimpkins/Crunch _name: Crunch - brew: crunch + script: cd /tmp && rm -rf Crunch && git clone https://github.com/chrissimpkins/Crunch.git && make build-dependencies && make install-executable eul: _bin: null _desc: Menu bar application that shows system stats like CPU, RAM, and disk usage on macOS @@ -5143,6 +5144,7 @@ softwarePackages: _docs: https://www.getmonero.org/resources/user-guides/ _home: https://www.getmonero.org/ _restricted: true + _when:darwin: '! test -f /Applications/monero-wallet-gui.app/Contents/MacOS/monerod' brew: monero scoop: monero mymonero: @@ -7050,6 +7052,7 @@ softwarePackages: _name: Audacity appimage: Audacity apt: audacity + cask: audacity choco: audacity dnf: audacity flatpak: org.audacityteam.Audacity @@ -8880,6 +8883,15 @@ softwarePackages: _name: winrm-cli _type: cli yay: winrm-cli-git + browserosaurus: + _bin: null + _desc: + _docs: + _github: + _home: + _name: Browserosaurus + _when:cask: '! test -d /Applications/Browserosaurus.app' + cask: browserosaurus docker: _bin: docker _desc: null @@ -9309,6 +9321,22 @@ softwarePlugins: # cmd: Handled by .chezmoiexternal.toml plugins: - Microsoft.CST.AttackSurfaceAnalyzer.CLI + gcloud: + cmd: bash -c 'gcloud components install {PLUGIN}' + plugins: + - app-engine-go + - cloud-datastore-emulator + - cloud-firestore-emulator + - cloud-run-proxy + - gke-gcloud-auth-plugin + - kubectl + - kustomize + - log-streaming + - minikube + - pubsub-emulator + - skaffold + - terraform-tools + update: gcloud components update gh: cmd: bash -c 'if [ -n "$GITHUB_TOKEN" ] && ! gh extension list | grep {PLUGIN}; then gh extension install {PLUGIN}; fi' plugins: