From 531d821e11f693f3af8d3cad9392784db510d5cb Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Thu, 1 Jun 2023 05:55:48 +0000 Subject: [PATCH] Fixed up queued / deprecated sections --- home/.chezmoidata.yaml | 147 +++++++++++++++++++++++++---------------- home/dot_bashrc | 5 ++ home/dot_zshrc | 5 ++ software.yml | 69 +++++++++++-------- 4 files changed, 140 insertions(+), 86 deletions(-) diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml index d8ff77b3..2cbcad7e 100644 --- a/home/.chezmoidata.yaml +++ b/home/.chezmoidata.yaml @@ -193,6 +193,7 @@ softwareGroups: Backup: &Backup - autorestic - ghorg + - mackup - restic - sanoid Backup-Desktop: &Backup-Desktop @@ -250,6 +251,7 @@ softwareGroups: - htmlq - hyperfine - jq + - lsd - mc - mcfly - nb @@ -264,6 +266,7 @@ softwareGroups: - procs - prettier - privoxy + - python2 - recoverpy - ripgrep - ripgrep-all @@ -295,6 +298,8 @@ softwareGroups: - charm - cod - desed + - difftastic + - emplace - emoj - fig - filebrowser @@ -320,6 +325,7 @@ softwareGroups: - peco - pgcli - pywhat + - sad - slack-term - slides - social-analyzer @@ -360,6 +366,8 @@ softwareGroups: - gphotos-sync - rclone - s5cmd + Compression: &Compression + - p7zip Communication: &Communication - irssi Communication-Desktop: &Communication-Desktop @@ -376,6 +384,9 @@ softwareGroups: - zoom Crypto: &Crypto - cointop + - monero + - monero-cli + - mymonero Crypto-Desktop: &Crypto-Desktop - ledger-live - onlykey @@ -651,6 +662,7 @@ softwareGroups: - ios-deploy - java - libimobiledevice + - license - ntl - openjdk - please @@ -747,6 +759,7 @@ softwareGroups: - debsecan - envchain - envconsul + - openssl - pony - protonvpn-cli - skate @@ -804,6 +817,7 @@ softwareGroups: - wireshark Templates: &Templates - confd + - consul-template - cookiecutter - gomplate Terraform: &Terraform @@ -897,6 +911,7 @@ softwareGroups: - ts2c - typescript - websocat + - wordops - wordpressify - wp-cli - wrangler @@ -1008,6 +1023,8 @@ softwareGroups: - *Essentials-Desktop - firewall-applet - firewall-config + - mas + - plymouth - stacer _Standard: &_Standard - *_Basic @@ -1138,6 +1155,8 @@ softwareGroups: - *Kubernetes - *Kubernetes-Desktop - *Networking + __hostname__maas: + - maas __hostname__media-tmpl: - *Media - *Media-Desktop @@ -1174,72 +1193,86 @@ softwareGroups: - *Browsers-Desktop __hostname__work-tmpl: [] deprecated: - - apt-cacher-ng - - bivac - - boilr - - captain - - consul-template - - diffsofancy - - difftastic - - emplace - - gvm - - htop - - hyper - - jenv - - kitty + - pkg: apt-cacher-ng + note: Deprecated in favor of using Sonatype Nexus apt proxies. + - pkg: asdf + note: ASDF is currently installed via a script rather than in the software definitions. + - pkg: astronvim + note: AstronVIM is deprecated in favor of NvChad which has more stars and is less troublesome to install (in our experience) + - pkg: bivac + note: Deprecated in favor of using the RClone Docker plugin for S3-backed mounts + - pkg: boilr + note: Deprecated in favor of using `gomplate` + - pkg: captain + note: Unused Docker assistance package + - pkg: catfs + note: CatFS is reportedly in the alpha stage of development and we experienced issues when trying to use it. + - pkg: cerebro + note: macOS system search more native way of providing similar features. Better alternatives are available. + - pkg: chromium + note: Deprecated in favor of the regular Chrome. + - pkg: diffsofancy + note: Deprecated in favor of `delta` + - pkg: easyengine + note: Deprecated in favor of `wordops` which is the new and improved version of EasyEngine + - pkg: gdu + note: Deprecated in favor of `duf` which is written in Rust + - pkg: gvm + note: Deprecated in favor of using ASDF. + - pkg: hyper + note: Deprecated in favor of Tabby for a full-featured terminal. + - pkg: jenv + note: Deprecated in favor of using ASDF or SDKMan + - pkg: kitty + note: Deprecated in favor of using alternative terminals such as iTerm2, Tabby, and bundled Linux terminals. - pkg: lepton note: Deprecated in favor of [Pieces](https://pieces.app/). The core components of Pieces are not open-source but the functionality is significantly better than massCode. - - license - - lpass - - lsd - - mackup + - pkg: lpass + note: Deprecated in favor of using the BitWarden password manager and its related tools. + - pkg: lsd + note: Deprecated in favor of using `exa`. `lsd` may be re-introduced when Windows support is added. - pkg: masscode # Deprecated in favor of Pieces note: Deprecated in favor of [Pieces](https://pieces.app/). The core components of Pieces are not open-source but the functionality is significantly better than massCode. - - nordvpn - - nvm - - pyenv - - s3filesystem - - starship - - raindrop - - rear - - rvm - - sad - - supdock - - termius - - ulauncher - # Some plugins do not work with vscodium - - vscodium + - pkg: multipass + note: Opens persistent menu icon on GNOME and has issues that sometimes require switching the virt driver + - pkg: nordvpn + note: Deprecated in favor of leveraging ProtonVPN as the primary VPN service. + - pkg: nvm + note: Deprecated in favor of using ASDF. + - pkg: pip + note: The `pip` installation is handled by the `install-software` program bundled with Install Doctor. + - pkg: pipx + note: The `pipx` installation is handled by the `install-software` program bundled with Install Doctor. + - pkg: pyenv + note: Deprecated in favor of using ASDF. + - pkg: s3filesystem + note: Deprecated in favor of using RClone. + - pkg: starship + note: Deprecated in favor of alternative terminal status prompts such as PowerLevel10k. + - pkg: raindrop + note: Deprecated because browser extensions do a better job of unifying bookmarks. Namely, the extension called Floccus allows cross-browser bookmark syncing. The Raindrop package also requires a paid subscription for advanced features. + - pkg: rvm + note: Deprecated in favor of using ASDF. + - pkg: temps + note: macOS menu bar app for weather. Buggy software. + - pkg: termius + note: Deprecated since all the interesting features require a paid subscription. + - pkg: ulauncher + note: Deprecated in favor of alternative app launchers. + - pkg: vscodium + note: Not all VSCode plugins work with VSCodium. + - pkg: yubikey-agent + note: The OpenSSH library can now create native keys that integrate with the client. # Files below need to be reviewed before adding them to the stack. They should include all of the # definitions in software.yml that are not included somewhere in the definitions that this file # maps out. queued: - # Opens persistent menu icon on GNOME and has issues that sometimes require switching the virt driver - - multipass - - monero - # macOS system search more native way of providing similar features --- explore leveraging this on Linux - - cerebro - - catfs - - lzop - - mas - - mbuffer - - pip - - pipx - - python2 + - pkg: editly + note: Editly NPM package is failing to install on macOS. Attempts to compile with node-gyp and fails. + - pkg: rear + note: System backup utility that may be incorporated after comparing it with alternative and perhaps better alternatives. + helmCharts: - vector - - maas - - gdu - - easyengine - - yubikey-agent - - p7zip - - openssl - - plymouth - - chromium - - astronvim - # macOS menu bar app for weather - little bit buggy - - temps - - asdf - # editly NPM package is failing to install on macOS - attempts to compile with node-gyp - - editly softwarePlugins: docker: plugins: diff --git a/home/dot_bashrc b/home/dot_bashrc index d4a152c7..adbc7795 100644 --- a/home/dot_bashrc +++ b/home/dot_bashrc @@ -91,6 +91,11 @@ if [ "$BASH_SUPPORT" = 'true' ]; then eval "$(direnv hook bash)" fi + ### Emplace + if command -v emplace > /dev/null; then + source <(emplace init bash) + fi + ### Java (asdf) if [ -f "$ASDF_DATA_DIR/plugins/java/set-java-home.bash" ]; then . "$ASDF_DATA_DIR/plugins/java/set-java-home.bash" diff --git a/home/dot_zshrc b/home/dot_zshrc index b9a359e7..27c55685 100644 --- a/home/dot_zshrc +++ b/home/dot_zshrc @@ -397,6 +397,11 @@ if command -v direnv > /dev/null; then eval "$(direnv hook zsh)" fi +### Emplace +if command -v emplace > /dev/null; then + eval "$(emplace init zsh)" +fi + ### Java (asdf) # if [ -f "$ASDF_DATA_DIR/plugins/java/set-java-home.zsh" ]; then # . "$ASDF_DATA_DIR/plugins/java/set-java-home.zsh" diff --git a/software.yml b/software.yml index afde0159..943f9046 100644 --- a/software.yml +++ b/software.yml @@ -1141,6 +1141,14 @@ softwarePackages: _name: Carthage brew:darwin: carthage _type: cli + wordops: + _bin: wo + _desc: Install and manage a high performance WordPress stack with a few keystrokes + _docs: https://docs.wordops.net/ + _github: https://github.com/WordOps/WordOps + _home: https://wordops.net/ + _name: WordOps + script:debian: wget -qO wo wops.cc && sudo bash wo imageoptim: _bin: null _docs: null @@ -2198,12 +2206,12 @@ softwarePackages: npm: emoj _type: cli emplace: - _bin: null + _bin: emplace _desc: Emplace objects and arrays - pointer to pointer style - _docs: null - _github: null - _home: null - _name: null + _docs: https://github.com/tversteeg/emplace + _github: https://github.com/tversteeg/emplace + _home: https://github.com/tversteeg/emplace + _name: Emplace cargo: emplace nix: emplace scoop: emplace @@ -4733,13 +4741,14 @@ softwarePackages: ansible: professormanhattan.lpass _type: cli lsd: - _bin: null + _bin: lsd _desc: '[LSD](https://github.com/Peltoche/lsd) (LSDeluxe), a clone of ls, is the next gen ls command with colorful output, file type icons, and more.' - _docs: null + _docs: https://github.com/lsd-rs/lsd _github: https://github.com/Peltoche/lsd - _home: null + _home: https://github.com/lsd-rs/lsd _name: LSD (LSDeluxe) - ansible: professormanhattan.lsd + _notes: Only the Chocolatey definition is included because LSD is only used on Windows (when `exa` is not available) + choco: lsd lxc: _bin: lxc _desc: Linux Containers is an operating-system-level virtualization method for running multiple isolated Linux systems on a control host using a single Linux kernel. @@ -4783,8 +4792,8 @@ softwarePackages: _github: https://github.com/maas/maas _home: https://maas.io/ _name: MAAS - ansible: professormanhattan.maas - _type: cli + ansible:ubuntu: professormanhattan.maas + snap:ubuntu: maas mackup: _bin: null _desc: '[mackup](https://github.com/lra/mackup) lets you keep your application settings in sync.' @@ -5091,7 +5100,7 @@ softwarePackages: _name: Starred pipx: starred monero: - _bin: monero-gui + _bin: org.getmonero.Monero _desc: '[Monero](https://www.getmonero.org/) is a leading cryptocurrency focused on private and censorship-resistant transactions. This role installs the Monero wallet application which is required for interacting with the Monero network.' _docs: https://www.getmonero.org/resources/user-guides/ _github: https://github.com/monero-project/monero @@ -5099,11 +5108,26 @@ softwarePackages: _name: Monero _when:cask: '! test -d /Applications/monero-wallet-gui.app' ansible: professormanhattan.monero - brew: monero cask: monero-wallet choco: monero flatpak: org.getmonero.Monero - _type: application + monero-cli: + _bin: monerod + _desc: CLI for Monero, a leading cryptocurrency focused on private and censorship-resistant transactions. + _github: https://github.com/monero-project/monero + _docs: https://www.getmonero.org/resources/user-guides/ + _home: https://www.getmonero.org/ + brew: monero + scoop: monero + mymonero: + _bin: null + _desc: Easy-to-use Monero client with managed keys + _github: https://github.com/mymonero/mymonero-app-js + _docs: https://github.com/mymonero/mymonero-app-js + _home: https://mymonero.com/ + _when:cask: '! test -d /Applications/MyMonero.app' + cask: mymonero + choco: mymonero motrix: _bin: motrix _desc: '[Motrix](https://motrix.app/) is a full-featured download manager that supports downloading HTTP, FTP, BitTorrent, Magnet, etc.' @@ -6413,6 +6437,7 @@ softwarePackages: _name: null apt: python2 brew: python2 + choco: python2 dnf: python2 pacman: python2 scoop: python2 @@ -6900,12 +6925,6 @@ softwarePackages: pv: _bin: pv apt: pv - mbuffer: - _bin: mbuffer - apt: mbuffer - lzop: - _bin: lzop - apt: lzop santa: _bin: santactl _desc: A binary authorization system for MacOS (santa) role is a daemon that makes execution decisions based on the contents of a local database, a GUI agent that notifies the user in case of a block decision and a command-line utility for managing the system and synchronizing the database with a server. @@ -8300,6 +8319,7 @@ softwarePackages: _bin: codium _snapClassic: true _when:cask: '! test -d "/Applications/VSCodium.app"' + appimage: vscodium/vscodium cask: vscodium choco: vscodium flatpak: com.vscodium.codium @@ -9009,15 +9029,6 @@ softwarePackages: flatseal: _bin: flatseal flatpak: com.github.tchx84.Flatseal - supdock: - _bin: supdock - _desc: A slightly more visual way to interact with the docker daemon. Supdock is a wrapper for the docker command meaning you can still use all of the other docker commands without issues - _docs: null - _github: https://github.com/segersniels/supdock - _home: null - _name: supdock - _type: cli - npm: supdock softwarePlugins: dotnet: cmd: null