From 48a4d9f5b4931a38bea598280c1d942676acabe2 Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Sun, 9 Jul 2023 05:50:23 +0000 Subject: [PATCH] Latest --- docs/TODO.md | 1 + home/.chezmoidata.yaml | 5 +- .../run_onchange_after_14-warp.sh.tmpl | 6 +-- home/dot_config/shell/exports.sh.tmpl | 1 + home/dot_local/bin/executable_install-program | 4 +- software.yml | 54 +++++++++++++------ 6 files changed, 48 insertions(+), 23 deletions(-) diff --git a/docs/TODO.md b/docs/TODO.md index 146c4688..bb607ccf 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -214,6 +214,7 @@ The following items have been reviewed but need to be revisited due to complexit * [Title](https://github.com/telekom-security/tpotce) * [Title](https://flathub.org/apps/com.airtame.Client) * [Title](https://github.com/Aloxaf/fzf-tab) +[Title](https://github.com/haproxy/haproxy) ## Docker Issue diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml index 42ec0442..e3de359b 100644 --- a/home/.chezmoidata.yaml +++ b/home/.chezmoidata.yaml @@ -373,6 +373,7 @@ softwareGroups: - stegcloak - thefuck - tldr + - xdotool - tmuxinator - up - wallpaper-cli @@ -655,6 +656,7 @@ softwareGroups: - exiftool - ffmpeg - imagemagick + - jpegoptim - korkut - pandoc - sharp @@ -784,6 +786,7 @@ softwareGroups: - nebula - ngrok - privaxy + - pwnat - rustscan - ssl-proxy - tailscale @@ -886,7 +889,6 @@ softwareGroups: Server: &Server - cockpit - cups - - elastic-agent - netdata - samba - sftpgo @@ -1119,7 +1121,6 @@ softwareGroups: - cockpit - docker - dotnet - - elastic-agent - envchain - etcd - exiftool diff --git a/home/.chezmoiscripts/universal/run_onchange_after_14-warp.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_14-warp.sh.tmpl index 0f3bd6b0..e7efca05 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_14-warp.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_14-warp.sh.tmpl @@ -159,19 +159,19 @@ if command -v warp-cli > /dev/null; then ### NPM if command -v npm > /dev/null; then - logg info "Configuring `npm` to use "${XDG_DATA_HOME:-$HOME/.local/share}/warp/Cloudflare_CA.crt"" + logg info "Configuring npm to use "${XDG_DATA_HOME:-$HOME/.local/share}/warp/Cloudflare_CA.crt"" npm config set cafile "${XDG_DATA_HOME:-$HOME/.local/share}/warp/Cloudflare_CA.pem" fi ### Python if command -v python3 > /dev/null; then - logg info "Configuring `python3` / `python` to use "${XDG_DATA_HOME:-$HOME/.local/share}/warp/Cloudflare_CA.pem"" + logg info "Configuring python3 / python to use "${XDG_DATA_HOME:-$HOME/.local/share}/warp/Cloudflare_CA.pem"" echo | cat - "${XDG_DATA_HOME:-$HOME/.local/share}/warp/Cloudflare_CA.pem" >> $(python3 -m certifi) fi ### Google Cloud SDK if command -v gcloud > /dev/null; then - logg info "Configuring `gcloud` to use "${XDG_DATA_HOME:-$HOME/.local/share}/warp/Cloudflare_CA.pem" and "${XDG_DATA_HOME:-$HOME/.local/share}/curl/cacert.pem"" + logg info "Configuring gcloud to use "${XDG_DATA_HOME:-$HOME/.local/share}/warp/Cloudflare_CA.pem" and "${XDG_DATA_HOME:-$HOME/.local/share}/curl/cacert.pem"" mkdir -p "${XDG_DATA_HOME:$HOME/.local/share}/gcloud" cat cacert.pem "${XDG_DATA_HOME:-$HOME/.local/share}/warp/Cloudflare_CA.pem" > "${XDG_DATA_HOME:$HOME/.local/share}/gcloud/ca.pem" gcloud config set core/custom_ca_certs_file "${XDG_DATA_HOME:$HOME/.local/share}/gcloud/ca.pem" diff --git a/home/dot_config/shell/exports.sh.tmpl b/home/dot_config/shell/exports.sh.tmpl index c2229684..aa60e5a1 100644 --- a/home/dot_config/shell/exports.sh.tmpl +++ b/home/dot_config/shell/exports.sh.tmpl @@ -161,6 +161,7 @@ if [ -d /Applications ] && [ -d /Library ]; then elif [ -d /home/linuxbrew/.linuxbrew/opt/dotnet ]; then export DOTNET_ROOT="/home/linuxbrew/.linuxbrew/opt/dotnet/libexec" fi +export PATH="$PATH:$XDG_CONFIG_HOME/dotnet/.dotnet/tools" ### Elastic Agent # https://www.elastic.co/guide/en/fleet/current/agent-environment-variables.html#env-common-vars diff --git a/home/dot_local/bin/executable_install-program b/home/dot_local/bin/executable_install-program index 13906c49..d6843536 100644 --- a/home/dot_local/bin/executable_install-program +++ b/home/dot_local/bin/executable_install-program @@ -89,7 +89,9 @@ function wrapMessage(msg) { } function runCommand(spinnerTitle, command) { - execSync(command.includes('sudo') ? `sudo "$(which gum)" spin --spinner dot --title "${spinnerTitle}" -- ${command}` : `gum spin --spinner dot --title "${spinnerTitle}" -- ${command}`, { + // execSync(command.includes('sudo') ? `sudo "$(which gum)" spin --spinner dot --title "${spinnerTitle}" -- ${command}` : `gum spin --spinner dot --title "${spinnerTitle}" -- ${command}`, { + log('info', 'CMD', spinnerTitle) + execSync(command, { stdio: 'inherit', shell: true, // Timeout of 30m diff --git a/software.yml b/software.yml index 1baef47a..f36de256 100644 --- a/software.yml +++ b/software.yml @@ -2420,18 +2420,6 @@ softwarePackages: _github: https://github.com/logspace-ai/langflow _name: LangFlow pipx: langflow - elastic-agent: - # Elastic Agent performs some security measures that make it so that checking the bin only works - # with sudo. So the _when condition is added to account for this circumstance. - _bin: elastic-agent - _desc: >- - [Elastic Agent](https://www.elastic.co/guide/en/fleet/current/elastic-agent-installation-configuration.html) is a single, unified way to add monitoring for logs, metrics, and other types of data to each host. A single agent makes it easier and faster to deploy monitoring across your infrastructure. The agent’s single, unified policy makes it easier to add integrations for new data sources. You can use Elastic Agent with Fleet. [Fleet](https://www.elastic.co/guide/en/kibana/current/fleet.html) is a Kibana service that allows you to add and manage integrations for popular services and platforms, as well as manage Elastic Agent installations. - _docs: https://www.elastic.co/guide/index.html - _github: https://github.com/elastic/elastic-agent - _home: https://www.elastic.co/ - _name: Elastic Agent - ansible: professormanhattan.elasticagent - brew: elastic/tap/elastic-agent electron: _bin: electron _desc: '[Electron](https://www.electronjs.org/) allows you to build cross-platform desktop apps with JavaScript, HTML, and CSS' @@ -3090,7 +3078,7 @@ softwarePackages: _github: null _home: null _name: null - _when:cask: '! ((brew list font-sf-mono-nerd-font | grep SFMono) && (brew list font-hack-nerd-font | grep Hack) && (brew list font-meslo-lg-nerd-font | grep Meslo))' + _when:cask: '! ((brew list font-sf-mono-nerd-font | grep SFMono > /dev/null) && (brew list font-hack-nerd-font | grep Hack > /dev/null) && (brew list font-meslo-lg-nerd-font | grep Meslo > /dev/null))' cask: - epk/epk/font-sf-mono-nerd-font - homebrew/cask-fonts/font-hack-nerd-font @@ -4360,6 +4348,7 @@ softwarePackages: _github: https://github.com/ipfs/ipfs-desktop _home: https://ipfs.tech/ _name: IPFS Desktop + _service:cask: ipfs _when:cask: '! test -d "/Applications/IPFS Desktop.app"' appimage: https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.28.0/ipfs-desktop-0.28.0-linux-x86_64.AppImage cask: ipfs @@ -5260,8 +5249,9 @@ softwarePackages: flatpak: io.mpv.Mpv swifty: _bin: swifty - _github: + _github: https://github.com/swiftyapp/swifty _name: Swifty + _when:cask: '! test -d /Applications/Swifty.app' appimage: swiftyapp/swifty cask: swifty exe: https://github.com/swiftyapp/swifty/releases/download/v0.6.13/Swifty-Setup-0.6.13.exe @@ -5841,6 +5831,7 @@ softwarePackages: _bin: mutagen _github: https://github.com/mutagen-io/mutagen _name: Mutagen + _post: mutagen daemon start && mutagen daemon register brew: mutagen-io/mutagen/mutagen newman: _bin: newman @@ -6654,6 +6645,32 @@ softwarePackages: cask: plex choco: plex flatpak: tv.plex.PlexDesktop + pwnat: + _bin: pwnat + _github: https://github.com/samyk/pwnat + _name: pwnat + brew: pwnat + xdotool: + _bin: xdotool + _github: https://github.com/jordansissel/xdotool + _name: xdotool + apt: xdotool + brew: xdotool + dnf: xdotool + pacman: xdotool + pkg-freebsd: xdotool + port: xdotool + zypper: xdotool + jpegoptim: + _bin: jpegoptim + _github: https://github.com/tjko/jpegoptim + _name: JPEGOptim + apt: jpegoptim + brew: jpegoptim + choco: jpegoptim + dnf: jpegoptim + pacman: jpegoptim + zypper: jpegoptim plex-media-server: _bin: plex-media-server _github: false @@ -7045,7 +7062,7 @@ softwarePackages: _github: null _home: null _name: null - _when: echo '! ((brew list provisionql | grep ProvisionQL) && (brew list qlcolorcode | grep QLColorCode) && (brew list qlimagesize | grep qlImageSize) && (brew list qlmarkdown | grep QLMarkdown) && (brew list qlstephen | grep QLStephen) && (brew list qlvideo | grep QLVideo) && (brew list quicklook-json | grep QuickLookJSON) && (brew list quicklookapk | grep QuickLookAPK) && (brew list webpquicklook | grep WebpQuickLook))' | bash + _when: echo '! ((brew list provisionql | grep ProvisionQL > /dev/null) && (brew list qlcolorcode | grep QLColorCode > /dev/null) && (brew list qlimagesize | grep qlImageSize > /dev/null) && (brew list qlmarkdown | grep QLMarkdown > /dev/null) && (brew list qlstephen | grep QLStephen > /dev/null) && (brew list qlvideo | grep QLVideo > /dev/null) && (brew list quicklook-json | grep QuickLookJSON > /dev/null) && (brew list quicklookapk | grep QuickLookAPK > /dev/null) && (brew list webpquicklook | grep WebpQuickLook > /dev/null))' | bash cask: - provisionql - qlcolorcode @@ -7131,6 +7148,7 @@ softwarePackages: _bin: redis-insight _github: https://github.com/RedisInsight/RedisInsight _name: Redis Insight + _post:cask: if [ -d ~/Applications/RedisInsight.app ]; then mv ~/Applications/RedisInsight.app /Applications/RedisInsight.app; fi _when:cask: '! test -d /Applications/RedisInsight.app' cask: redisinsight flatpak: com.redis.RedisInsight @@ -9926,7 +9944,7 @@ softwarePlugins: plugins: - docker.io/nginx/unit dotnet: - cmd: sudo chown -r "$USER" "$HOME/.local/share/NuGet" && dotnet tool install -g {PLUGIN} + cmd: dotnet tool install -g {PLUGIN} plugins: - Microsoft.CST.AttackSurfaceAnalyzer.CLI - dotnet-format @@ -10046,12 +10064,14 @@ softwarePlugins: - vagrant-google - vagrant-hostmanager - vagrant-libvirt - - vagrant-openstack-provider + # - vagrant-openstack-provider + - vagrant-openstack - vagrant-parallels - vagrant-proxmox - vagrant-share - vagrant-vbguest - vagrant-vmware-desktop + - vagrant-xenserver visual-studio: cmd: null plugins: