From 9c4480e3e1088e8bf0be22861bc6908096448cb5 Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Sat, 24 Jun 2023 07:54:01 +0000 Subject: [PATCH] Latest --- docs/INSPIRATION.md | 11 +++++- docs/TODO.md | 19 +++++++++- home/.chezmoidata.yaml | 8 ++++ home/.chezmoiexternal.toml.tmpl | 8 +++- home/dot_bashrc | 5 +++ home/dot_config/shell/profile.sh.tmpl | 5 --- home/dot_zshrc | 5 +++ scripts/provision.sh | 13 +++++++ scripts/src/provision.sh.tmpl | 13 +++++++ software.yml | 54 ++++++++++++++++++++++++--- 10 files changed, 127 insertions(+), 14 deletions(-) diff --git a/docs/INSPIRATION.md b/docs/INSPIRATION.md index f00eb16c..74f3087a 100644 --- a/docs/INSPIRATION.md +++ b/docs/INSPIRATION.md @@ -16,6 +16,7 @@ * https://github.com/changkun/occamy * https://cliffy.io/docs@v0.25.7 * https://github.com/gotify/server +* https://github.com/typicode/lowdb ## System @@ -53,6 +54,12 @@ * https://github.com/sorry-cypress/sorry-cypress * https://github.com/MauriceNino/dashdot * https://github.com/coralproject/talk +* https://github.com/ijjk/notion-blog +* https://github.com/NodeBB/NodeBB +* https://github.com/ToolJet/ToolJet +* https://github.com/pouchdb/pouchdb +* https://uppy.io/docs/dashboard/ +* https://unkey.dev/ ## Serverless @@ -64,4 +71,6 @@ * https://send.vis.ee/ * https://rustpad.io/ * https://anonaddy.com/ -* https://claper.co/ \ No newline at end of file +* https://claper.co/ +* https://namelix.com/ +* https://gchq.github.io/CyberChef \ No newline at end of file diff --git a/docs/TODO.md b/docs/TODO.md index 78411ea3..9cc27188 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -12,6 +12,8 @@ This page outlines various projects and tasks that we are currently working on. * https://github.com/butlerx/wetty * Add https://github.com/badaix/snapcast * JavaScript start at 10k +* Go through https://github.com/jaywcjlove/awesome-mac +* https://codesandbox.io/ https://github.com/firecracker-microvm/firecracker ## Upstream @@ -112,6 +114,20 @@ The following items are Docker containers that we may want to include as default * https://spaceb.in/ - Pastebin https://github.com/WantGuns/bin * https://github.com/AlexSciFier/neonlink - bookmarks * https://github.com/josdejong/jsoneditor - JSON editor +* https://github.com/AppFlowy-IO/AppFlowy - Notion alternative +* https://github.com/apitable/apitable +* https://github.com/mattermost/mattermost +* https://github.com/duolingo/metasearch +* https://github.com/withspectrum/spectrum +* https://github.com/NginxProxyManager/nginx-proxy-manager +* https://github.com/node-red/node-red +* https://www.overleaf.com/ + +## AI + +* https://github.com/hwchase17/langchain +* https://github.com/facebookresearch/ImageBind +* https://github.com/nomic-ai/gpt4all ### Kubernetes @@ -151,4 +167,5 @@ The following items have been reviewed but need to be revisited due to complexit * https://github.com/Kanaries/Rath * cvat.io * https://github.com/illacloud/illa-builder -* https://github.com/metrue/fx \ No newline at end of file +* https://github.com/metrue/fx +* https://github.com/siyuan-note/siyuan \ No newline at end of file diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml index 103ca87f..3e16cf0f 100644 --- a/home/.chezmoidata.yaml +++ b/home/.chezmoidata.yaml @@ -161,6 +161,8 @@ softwareGroups: AI-Desktop: &AI-Desktop - chatgpt-nofwl - chatgpt-menubar + - gpt-engineer + - langflow - mage-ai Android: &Android - scrcpy @@ -459,6 +461,7 @@ softwareGroups: - usql Database-Desktop: &Database-Desktop - beekeeper-studio + - medis - mongodb-compass - sqlectron Development-Tools-Desktop: &Development-Tools-Desktop @@ -675,6 +678,7 @@ softwareGroups: - obs-studio - plex - plex-htpc + - prezi-video - raspberry-pi-imager - shotcut - shotwell @@ -963,6 +967,7 @@ softwareGroups: Virtualization-Desktop: &Virtualization-Desktop - docker-desktop - gnome-boxes + - orbstack - parallels - quickgui - utm @@ -1001,6 +1006,7 @@ softwareGroups: - ipfs-deploy - jest - json-server + - lighthouse - localtunnel - majestic - medusa @@ -1014,6 +1020,7 @@ softwareGroups: - newman - ngrok - node-prune + - nodemon - np - npkill - npm-check # Similar to npm-check-updates @@ -1063,6 +1070,7 @@ softwareGroups: - markmap - mockoon - mqttx + - ndb - pieces - pieces-cli - pika diff --git a/home/.chezmoiexternal.toml.tmpl b/home/.chezmoiexternal.toml.tmpl index 9f3173fa..f3f9412a 100644 --- a/home/.chezmoiexternal.toml.tmpl +++ b/home/.chezmoiexternal.toml.tmpl @@ -190,9 +190,13 @@ pull.args = ["--ff-only"] ### iTerm2 Shell Integration -[".local/src/iterm2/shell-integration.sh"] +[".local/src/iterm2/shell-integration.zsh"] type = "file" - url = "https://iterm2.com/shell_integration/install_shell_integration.sh" + url = "https://iterm2.com/shell_integration/zsh" + refreshPeriod = "{{ $refreshPeriod }}" +[".local/src/iterm2/shell-integration.bash"] + type = "file" + url = "https://iterm2.com/shell_integration/bash" refreshPeriod = "{{ $refreshPeriod }}" ### Ansible Roles / Playbook diff --git a/home/dot_bashrc b/home/dot_bashrc index 53b00e2b..7d795c3a 100644 --- a/home/dot_bashrc +++ b/home/dot_bashrc @@ -110,6 +110,11 @@ if [ "$BASH_SUPPORT" = 'true' ]; then source <(emplace init bash) fi + ### iTerm2 + if [ -f "$HOME/.local/src/iterm2/shell-integration.bash" ]; then + source "$HOME/.local/src/iterm2/shell-integration.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_config/shell/profile.sh.tmpl b/home/dot_config/shell/profile.sh.tmpl index 7969b98f..2e43f85d 100644 --- a/home/dot_config/shell/profile.sh.tmpl +++ b/home/dot_config/shell/profile.sh.tmpl @@ -124,11 +124,6 @@ fi # . "$HOME/.local/scripts/fzf-tmux.bash" #fi -### iTerm2 -if [ -f "$HOME/.local/src/iterm2/shell-integration.sh" ]; then - source "$HOME/.local/src/iterm2/shell-integration.sh" -fi - ### McFly export MCFLY_PROMPT="❯" if [ -d /Applications ] && [ -d /System ]; then diff --git a/home/dot_zshrc b/home/dot_zshrc index 9e75879e..633b66f4 100644 --- a/home/dot_zshrc +++ b/home/dot_zshrc @@ -424,6 +424,11 @@ if [ -f "$HOMEBREW_PREFIX/share/google-cloud-sdk/completion.zsh.inc" ]; then source "$HOMEBREW_PREFIX/share/google-cloud-sdk/completion.zsh.inc" fi +### iTerm2 +if [ -f "$HOME/.local/src/iterm2/shell-integration.zsh" ]; then + source "$HOME/.local/src/iterm2/shell-integration.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/scripts/provision.sh b/scripts/provision.sh index dea52adb..892683c4 100644 --- a/scripts/provision.sh +++ b/scripts/provision.sh @@ -54,6 +54,19 @@ # @description Ensure Ubuntu / Debian run in `noninteractive` mode export DEBIAN_FRONTEND=noninteractive +# @description Load default settings if it is in a CI setting +if [ -n "$CI" ]; then + export HOST="$HOST" + export NO_RESTART=true + export HEADLESS_INSTALL=true + export SOFTWARE_GROUP="Full" + export FULL_NAME="Brian Zalewski" + export PRIMARY_EMAIL="help@megabyte.space" + export PUBLIC_SERVICES_DOMAIN="megabyte.space" + export RESTRICTED_ENVIRONMENT=false + export WORK_ENVIRONMENT=false +fi + # @description Detect `START_REPO` format and determine appropriate git address, otherwise use the master Install Doctor branch if [ -z "$START_REPO" ]; then START_REPO="https://github.com/megabyte-labs/install.doctor.git" diff --git a/scripts/src/provision.sh.tmpl b/scripts/src/provision.sh.tmpl index 8a09cc78..462a48e9 100644 --- a/scripts/src/provision.sh.tmpl +++ b/scripts/src/provision.sh.tmpl @@ -54,6 +54,19 @@ # @description Ensure Ubuntu / Debian run in `noninteractive` mode export DEBIAN_FRONTEND=noninteractive +# @description Load default settings if it is in a CI setting +if [ -n "$CI" ]; then + export HOST="$HOST" + export NO_RESTART=true + export HEADLESS_INSTALL=true + export SOFTWARE_GROUP="Full" + export FULL_NAME="Brian Zalewski" + export PRIMARY_EMAIL="help@megabyte.space" + export PUBLIC_SERVICES_DOMAIN="megabyte.space" + export RESTRICTED_ENVIRONMENT=false + export WORK_ENVIRONMENT=false +fi + # @description Detect `START_REPO` format and determine appropriate git address, otherwise use the master Install Doctor branch if [ -z "$START_REPO" ] && [ -z "$REPO" ]; then START_REPO="https://github.com/megabyte-labs/install.doctor.git" diff --git a/software.yml b/software.yml index a6f4a08f..00e47f43 100644 --- a/software.yml +++ b/software.yml @@ -1209,7 +1209,7 @@ softwarePackages: _github: https://github.com/Barre/privaxy _home: false _name: Privaxy - _when:script:darwin: test -d /Applications/Privaxy.app + _when:script:darwin: '! test -d /Applications/Privaxy.app' appimage: barre/privaxy apt: https://github.com/Barre/privaxy/releases/download/v0.5.2/privaxy_0.5.2_amd64.deb script:darwin: curl -sSL https://github.com/Barre/privaxy/releases/download/v0.5.2/Privaxy_0.5.2_universal.dmg > /tmp/Privaxy.dmg && sudo hdiutil attach /tmp/Privaxy.dmg && sudo cp -R /Volumes/Privaxy/Privaxy.app /Applications && sudo hdiutil detach /Volumes/Privaxy && rm -f /tmp/Privaxy.dmg @@ -2346,6 +2346,39 @@ softwarePackages: _home: https://fleetdm.com/ _name: Fleet CLI npm: fleetctl + prezi-video: + _bin: prezi-video + _github: null + _name: Prezi Video + _when:cask: '! test -d "/Applications/Prezi Video.app"' + cask: prezi-video + orbstack: + _bin: orb + _github: + _name: OrbStack + _when:cask: '! test -d /Applications/OrbStack.app' + cask: orbstack + gpt-engineer: + _bin: gpt-engineer + _github: https://github.com/AntonOsika/gpt-engineer + _name: GPT Engineer + pipx: gpt-engineer + medis: + _bin: medis + _github: https://github.com/luin/medis + _name: Medis + _when:cask: '! test -d /Applications/Medis.app' + cask: medis + ndb: + _bin: ndb + _github: https://github.com/GoogleChromeLabs/ndb + _name: ndb + npm: ndb + langflow: + _bin: langflow + _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. @@ -5090,6 +5123,7 @@ softwarePackages: cask: mark-text choco: marktext github: github.com/marktext/marktext + winget: marktext yay: marktext mas: _bin: mas @@ -5414,7 +5448,7 @@ softwarePackages: _github: https://github.com/hschmidt/EnvPane _home: https://github.com/hschmidt/EnvPane _name: EnvPane - _when:script: test -d "$HOME/Library/PreferencePanes/EnvPane.prefPane" + _when:script: '! test -d "$HOME/Library/PreferencePanes/EnvPane.prefPane"' script:darwin: '(cd ~/Library/PreferencePanes && rm -rf EnvPane.prefPane && curl -sL https://github.com/hschmidt/EnvPane/releases/download/releases%2F0.8/EnvPane-0.8.tar.bz2 | tar -xjf -)' skhd: _bin: skhd @@ -5458,7 +5492,7 @@ softwarePackages: _docs: null _github: https://github.com/th-ch/youtube-music _home: https://th-ch.github.io/youtube-music/ - _when:script:darwin: test -d "/Applications/YouTube Music.app" + _when:script:darwin: '! test -d "/Applications/YouTube Music.app"' appimage: th-ch/youtube-music apt: https://github.com/th-ch/youtube-music/releases/download/v1.19.0/youtube-music_1.19.0_amd64.deb exe: https://github.com/th-ch/youtube-music/releases/download/v1.19.0/YouTube-Music-Setup-1.19.0.exe @@ -5473,7 +5507,7 @@ softwarePackages: _github: https://github.com/meowtec/Imagine _home: https://github.com/meowtec/Imagine _name: Imagine - _when:script:darwin: test -d /Applications/Imagine.app + _when:script:darwin: '! test -d /Applications/Imagine.app' appimage: meowtec/Imagine exe: https://github.com/meowtec/Imagine/releases/download/v0.7.4/Imagine-Setup-0.7.4.exe script:darwin: curl -sSL https://github.com/meowtec/Imagine/releases/download/v0.7.4/Imagine-0.7.4.dmg > /tmp/Imagine.dmg && sudo hdiutil attach /tmp/Imagine.dmg && sudo cp -R "/Volumes/Imagine 0.7.4/Imagine.app" /Applications && sudo hdiutil detach "/Volumes/Imagine 0.7.4" && rm -f /tmp/Imagine.dmg @@ -6564,6 +6598,11 @@ softwarePackages: ansible: professormanhattan.poetry brew: poetry yay: python-poetry-git + lighthouse: + _bin: lighthouse + _github: https://github.com/GoogleChrome/lighthouse + _name: Lighthouse + npm: lighthouse jest: _bin: jest _desc: Delightful JavaScript testing. @@ -7507,6 +7546,11 @@ softwarePackages: _name: ShareX ansible:windows: professormanhattan.sharex choco: sharex + nodemon: + _bin: nodemon + _github: https://github.com/remy/nodemon + _name: Nodemon + npm: nodemon sharp: _bin: sharp _desc: CLI for sharp (a Node.js image processing module) @@ -9539,7 +9583,7 @@ softwarePackages: _github: null _home: https://www.yubico.com/products/yubico-authenticator/ _name: Yubico Authenticator - _when:script:darwin: test -d "/Applications/Yubico Authenticator.app" + _when:script:darwin: '! test -d "/Applications/Yubico Authenticator.app"' choco: yubico-authenticator flatpak: com.yubico.yubioath script:darwin: curl -sSL https://developers.yubico.com/yubioath-flutter/Releases/yubico-authenticator-latest-mac.dmg > "/tmp/Yubico Authenticator.dmg" && hdiutil attach "/tmp/Yubico Authenticator.dmg" && sudo cp -R "/Volumes/Yubico Authenticator/Yubico Authenticator.app" /Applications && sudo hdiutil detach "/Volumes/Yubico Authenticator" && rm -f "/tmp/Yubico Authenticator.dmg"