From 6a880ba022da47a08fff8d3fce323f4244861be2 Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Sun, 5 Nov 2023 07:19:49 +0000 Subject: [PATCH] Various fixes to software.yml, deps, and telemetry --- home/.chezmoidata.yaml | 2 +- .../run_onchange_after_97-cloudflare.sh.tmpl | 9 +++- ...efore_09-install-brew-dependencies.sh.tmpl | 6 +-- home/.chezmoitemplates/darwin/Brewfile | 2 +- home/dot_config/shell/exports.sh.tmpl | 1 + software.yml | 44 +++++++++++++------ 6 files changed, 43 insertions(+), 21 deletions(-) diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml index 70b226bc..1c09d0db 100644 --- a/home/.chezmoidata.yaml +++ b/home/.chezmoidata.yaml @@ -320,7 +320,7 @@ softwareGroups: - solargraph - sql-language-server - task - - tea + - pkgx - tmux - tor - translate diff --git a/home/.chezmoiscripts/universal/run_onchange_after_97-cloudflare.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_97-cloudflare.sh.tmpl index 1d19bb8b..9db8dd24 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_97-cloudflare.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_97-cloudflare.sh.tmpl @@ -173,8 +173,13 @@ if command -v warp-cli > /dev/null; then if command -v python3 > /dev/null; then ### Ensure Certifi package is available globally if ! pip3 list certifi | grep certifi > /dev/null; then - logg info 'Ensuring certifi is installed globally for Python 3' - pip3 install certifi + if command -v brew > /dev/null; then + logg info 'Ensuring Python certifi is installed via Homebrew' + brew install python-certifi + else + logg info 'Ensuring certifi is installed globally for Python 3' + pip3 install certifibrew link --overwrite python-certifi + fi fi ### Copy CloudFlare PEM file to Python 3 location diff --git a/home/.chezmoiscripts/universal/run_onchange_before_09-install-brew-dependencies.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_09-install-brew-dependencies.sh.tmpl index 6139180c..38d8ff35 100644 --- a/home/.chezmoiscripts/universal/run_onchange_before_09-install-brew-dependencies.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_before_09-install-brew-dependencies.sh.tmpl @@ -6,7 +6,7 @@ # This script installs various libraries that are loosely required by the eco-system that Install Doctor # implements. It installs the following: # -# 1. `delta` - Delta is used by the git config as an alternate, improved pager terminal user-interface +# 1. `delta` - Delta (`git-delta` on Homebrew) is used by the git config as an alternate, improved pager terminal user-interface # 2. `gh` - GH (GitHub CLI) is included as a dependency for generating the global git config helper since GH provides a credential helper that can be used to authenticate calls on `github.com`. # 3. `go` - The Go framework # @@ -51,9 +51,9 @@ fi if ! command -v delta > /dev/null; then if command -v brew; then logg 'Installing delta via Homebrew' - brew install delta || DELTA_EXIT_CODE=$? + brew install git-delta || DELTA_EXIT_CODE=$? if [ -n "$DELTA_EXIT_CODE" ]; then - logg error 'delta was not successfully installed via Homebrew' + logg error 'git-delta was not successfully installed via Homebrew' fi else logg 'brew is unavailable. Cannot use it to perform a system installation of node.' diff --git a/home/.chezmoitemplates/darwin/Brewfile b/home/.chezmoitemplates/darwin/Brewfile index 9f258df5..24681e40 100644 --- a/home/.chezmoitemplates/darwin/Brewfile +++ b/home/.chezmoitemplates/darwin/Brewfile @@ -14,8 +14,8 @@ end brew "age" # Ensure macOS Bash gets upgraded to 5+ brew "bash" -brew "delta" brew "gawk" +brew "git-delta" brew "glow" brew "gnupg" brew "go" diff --git a/home/dot_config/shell/exports.sh.tmpl b/home/dot_config/shell/exports.sh.tmpl index ddf79e7c..36c7e5ea 100644 --- a/home/dot_config/shell/exports.sh.tmpl +++ b/home/dot_config/shell/exports.sh.tmpl @@ -7,6 +7,7 @@ ### Disable Telemetry export DO_NOT_TRACK=1 +export FUNCTIONS_CORE_TOOLS_TELEMETRY_OPTOUT=1 ### XDG # Source: # https://wiki.archlinux.org/index.php/XDG_Base_Directory diff --git a/software.yml b/software.yml index c5c660eb..45e1d159 100644 --- a/software.yml +++ b/software.yml @@ -656,6 +656,7 @@ softwarePackages: _github: https://github.com/appium/appium _home: https://appium.io/ _name: Appium + _service: appium brew: appium npm: appium appium-desktop: @@ -703,6 +704,8 @@ softwarePackages: _bin: blocky _github: https://github.com/0xERR0R/blocky _name: Blocky + _service: blocky + _serviceEnabled: true brew: blocky go: github.com/0xERR0R/blocky@mastergithub.com/0xERR0R/blocky@master http-toolkit: @@ -715,6 +718,7 @@ softwarePackages: _bin: tart _github: https://github.com/cirruslabs/tart _when:brew:darwin: '[ $(uname -m) = "arm64" ]' + _todo: Verify that this installs properly (error on arm64 macOS) brew:darwin: - tart - cirruslabs/cli/gitlab-tart-executor @@ -1883,6 +1887,7 @@ softwarePackages: _service:apt: clamav-freshclam _service:dnf: clamd-freshclam _service:pacman: clamav-freshclam + _service:brew: clamav apt: - clamav - clamdscan @@ -2072,7 +2077,6 @@ softwarePackages: _github: https://github.com/kelseyhightower/confd _home: null _name: confd - _service: consul brew: confd choco: confd github: github.com/kelseyhightower/confd @@ -2084,6 +2088,7 @@ softwarePackages: _github: https://www.github.com/hashicorp/consul _home: https://www.consul.io/ _name: Consul + _service: consul apt: consul brew: consul pkg: consul @@ -2791,6 +2796,7 @@ softwarePackages: _bin: haproxy _github: https://github.com/haproxy/haproxy _name: HAProxy + _service: haproxy apt: haproxy brew: haproxy choco: haproxy @@ -2900,6 +2906,7 @@ softwarePackages: _bin: mariadb _github: false _name: MariaDB + _service: mariadb brew: mariadb choco: mariadb dnf: mariadb-server @@ -3598,7 +3605,7 @@ softwarePackages: _github: https://github.com/antonmedv/fx _home: https://github.com/antonmedv/fx _name: FX - brew: metrue/fx/fx + brew: fx go: github.com/antonmedv/fx@latest pacman: fx pkg: fx @@ -4704,6 +4711,7 @@ softwarePackages: _home: null _name: CodeClimate _usesDocker: true + _todo: Add check to ensure Docker is loaded / running brew: codeclimate/formulae/codeclimate script:linux: cd /tmp && curl -L https://github.com/codeclimate/codeclimate/archive/master.tar.gz | tar xvz && cd codeclimate-* && sudo make install brew:darwin: codeclimate/formulae/codeclimate @@ -5183,7 +5191,7 @@ softwarePackages: _pre:scoop: scoop bucket add instrumenta https://github.com/instrumenta/scoop-instrumenta binary:darwin: https://github.com/instrumenta/kubeval/releases/latest/download/kubeval-darwin-amd64.tar.gz binary:linux: https://github.com/instrumenta/kubeval/releases/latest/download/kubeval-linux-amd64.tar.gz - brew: kubeval + brew: instrumenta/instrumenta/kubeval scoop: kubeval edex-ui: _bin: edex-ui @@ -5767,6 +5775,7 @@ softwarePackages: _home: null _name: minikube _post: minikube config set driver virtualbox + _todo: A full installation of Xcode.app 9.0 is required. Also, hyperkit x86_64 architecture is required for this software. So automate install of Xcode.app 9.0 and add check for x86_64 prior to installing this brew: minikube brew:darwin: - hyperkit @@ -6222,6 +6231,8 @@ softwarePackages: _github: https://github.com/slackhq/nebula _home: https://github.com/slackhq/nebula _name: nebula + _service: nebula + _serviceEnabled: true brew: nebula dnf: nebula pacman: nebula @@ -6366,6 +6377,7 @@ softwarePackages: _github: https://github.com/nginx/nginx _home: https://nginx.org/ _name: NGINX + _todo: Check out /opt/homebrew/etc/nginx/nginx.conf / nginx/servers _ports: - port: 80 proto: tcp @@ -6446,15 +6458,14 @@ softwarePackages: ansible: professormanhattan.nodejs brew: node scoop: nodejs - tea: - _bin: tea + pkgx: + _bin: pkgx _desc: The next-generation, cross‐platform package manager - _docs: https://docs.tea.xyz/ - _github: https://github.com/teaxyz/cli - _home: https://tea.xyz/ - _name: Tea - _post: tea --sync -n - brew: teaxyz/pkgs/tea-cli + _docs: https://docs.pkgx.sh/ + _github: https://github.com/pkgxdev/pkgx + _home: https://pkgx.sh/ + _name: pkgx + brew: pkgxdev/made/pkgx pipedream-cli: _bin: pd _desc: Connect APIs, remarkably fast. Free for developers. @@ -7586,7 +7597,8 @@ softwarePackages: _home: null _name: null apt: python2 - brew: python2 + # Prepare an alternate method for installing python2 on macOS - python2 package no longer works + # brew: python2 choco: python2 dnf: python2 pacman: python2 @@ -9709,7 +9721,8 @@ softwarePackages: _home: null _name: Unbuffer apt: unbuffer - brew: unbuffer + # expect package on Homebrew contains unbuffer + brew: expect dnf: unbuffer pacman: unbuffer up: @@ -10363,6 +10376,7 @@ softwarePackages: _github: https://github.com/cloudflare/boringtun _home: null _name: BoringTun + _todo: Add sudo boringtun-cli utun brew: boringtun cargo:darwin: boringtun-cli cargo:linux: boringtun-cli @@ -10417,7 +10431,9 @@ softwarePackages: _name: Wireshark _when:cask: '! test -d /Applications/Wireshark.app && ! test -d $HOME/Applications/Wireshark.app' apt: wireshark - cask: wireshark + cask: + - wireshark + - wireshark-chmodbpf choco: wireshark dnf: wireshark flatpak: org.wireshark.Wireshark