diff --git a/README.md b/README.md index 852b218..2f6a47d 100644 --- a/README.md +++ b/README.md @@ -75,10 +75,11 @@ flowchart TD | Tag | Description | |-----|-------------| | `developer` | Generic CLI dev base (the default: git, docker, shell utilities) | -| `developer-gui` | VS Code, Ghostty, DBeaver. Privacy + AI-upsell de-nag profile for VSCode/VSCodium/Cursor off unless `-e vscode_privacy_enabled=true` | +| `developer-gui` | VS Code, Ghostty. Privacy + AI-upsell de-nag profile for VSCode/VSCodium/Cursor off unless `-e vscode_privacy_enabled=true` | | `developer-rust` / `-go` / `-python` / `-node` / `-typescript` / `-c` | Language toolchains | | `infrastructure` | OpenTofu, OpenBao, AWS CLI, helm, terraform-docs, `k8s` (kubectl, kubectx, kubens, k9s, kind, argocd, kustomize, kubeconform, kube-linter), `data` (clickhouse-client, confluent-cli, rpk, valkey-cli, vector), `cloudflare` (flarectl, wrangler) | | `packer` | HashiCorp Packer from HashiCorp's repo or tap. Opt-in, in no persona | +| `dbeaver` | DBeaver Community DB GUI. Opt-in, in no persona | | `contributor` | hyperi-ci + its check tools (semgrep, alint), gitleaks, trivy, hadolint, pip-audit, yamllint, ansible-lint, pre-commit, act, git-scrub, macbash | | `soe` / `soe-gui` | HyperI org policy (opt-in) | | `wallpaper` | HyperI wallpaper only, from `soe-gui`: set as the desktop background and listed in the GNOME Settings picker | @@ -184,7 +185,8 @@ digest. Read that before changing a role or adding a tool. **Opt-in, via tags:** -- `developer-gui`: VS Code, Ghostty (Solarized theme), DBeaver +- `developer-gui`: VS Code, Ghostty (Solarized theme) +- `dbeaver` (off by default, and in no persona): DBeaver Community - `vscode-privacy` (off by default): strips the Copilot/AI upsell UI and the telemetry that stock VSCode ships enabled, across VSCode, VSCodium and Cursor. Enable with `-e vscode_privacy_enabled=true`. It merges one marked block into `settings.json` and never touches a comment or a key it does not manage, backs the file up before its first write, and `-e vscode_privacy_uninstall=true` takes only its own keys back out. Where you have set one of those keys yourself further down the file, yours wins and the run tells you which ones -- so it cannot look applied while changing nothing - Languages: Rust, Go, Python, C/C++, Node.js, TypeScript (the Astral suite -- uv, ruff, ty -- ships in the base, as does Node.js: it is core tooling that semantic-release and CI need) - `infrastructure`: OpenTofu + OpenBao (the OSS forks in place of terraform and vault), AWS CLI v2, checkov, and terraform-docs for generating IaC module reference docs (engine-agnostic -- it reads `.tf` whichever binary runs it, and OpenTofu has no native `tofu docs`). Under `k8s`: kubectl + kubectx + kubens + k9s + kind + argocd + kustomize + kubeconform + kube-linter. helm is NOT in that group -- it sits in `cloud`, so plain `--tags infrastructure` gets it whether or not you select `k8s`. The `data` group: clickhouse-client, confluent-cli, rpk, valkey-cli, vector. The `cloudflare` group: flarectl + wrangler (flarectl builds from source on both platforms -- Cloudflare ships no binary -- so Linux needs `developer-go`) diff --git a/ansible/playbooks/main.yml b/ansible/playbooks/main.yml index 86ab3af..9c3acbc 100644 --- a/ansible/playbooks/main.yml +++ b/ansible/playbooks/main.yml @@ -282,6 +282,12 @@ become: "{{ ansible_facts['distribution'] != 'MacOSX' }}" tags: ['packer', 'never'] + # DBeaver Community DB GUI (opt-in, in no persona). + - role: dbeaver + become: "{{ ansible_facts['distribution'] != 'MacOSX' }}" + tags: ['dbeaver', 'never'] + when: has_gnome | default(false) or ansible_facts['distribution'] == 'MacOSX' + # ======================================================================== # PERSONAS (meta-roles) — opinionated bundles that resolve to the roles # above via meta/dependencies. They pull the CLEAN developer base: its diff --git a/ansible/roles/developer-gui/tasks/dbeaver.yml b/ansible/roles/dbeaver/tasks/main.yml similarity index 100% rename from ansible/roles/developer-gui/tasks/dbeaver.yml rename to ansible/roles/dbeaver/tasks/main.yml diff --git a/ansible/roles/developer-gui/tasks/main.yml b/ansible/roles/developer-gui/tasks/main.yml index c0b5eeb..e6118ef 100644 --- a/ansible/roles/developer-gui/tasks/main.yml +++ b/ansible/roles/developer-gui/tasks/main.yml @@ -73,12 +73,3 @@ tags: ['developer-gui', 'ghostty'] tags: ['developer-gui', 'ghostty'] when: has_gnome | default(false) or ansible_facts['distribution'] == 'MacOSX' - -# DBeaver — DB GUI client. Per spec, lives in developer-gui. -- name: Install DBeaver Community - ansible.builtin.include_tasks: - file: dbeaver.yml - apply: - tags: ['developer-gui', 'dbeaver'] - tags: ['developer-gui', 'dbeaver'] - when: has_gnome | default(false) or ansible_facts['distribution'] == 'MacOSX' diff --git a/docs/install-matrix.md b/docs/install-matrix.md index 05ab56b..a227350 100644 --- a/docs/install-matrix.md +++ b/docs/install-matrix.md @@ -179,7 +179,6 @@ reach for instead, are not in that manifest and have no published digest at all. | VS Code | all | vendor-repo / cask | | Ghostty | Fedora (COPR) / macOS (cask) | vendor-repo / cask | | Ghostty | Ubuntu | PPA (`ppa:mkasberg/ghostty-ubuntu`, key pinned by fingerprint); 24.04 is frozen at Ghostty 1.3.1 by the PPA, only 26.04 tracks new releases; a series the PPA does not publish takes the newest series it does | -| DBeaver | all | Ubuntu vendor-repo (dbeaver.io/debs) / Fedora flatpak / cask | | VS Code privacy profile (opt-in: `-e vscode_privacy_enabled=true`) | all | bundled script (`hyperi-vscode-privacy`) | The privacy profile is off by default because it edits a personal @@ -332,6 +331,14 @@ warning and continues. The one HashiCorp tool installed: BUSL, with no open-source fork, so it is its own opt-in role rather than part of `infrastructure`. `--tags removals` takes terraform and vault, and removes this repo only where Packer is not installed. +### dbeaver + +| Tool(s) | Platforms | Method | +|---|---|---| +| DBeaver | all | Ubuntu: dbeaver.io apt repo / Fedora: flatpak / macOS: cask | + +Opt-in with `--tags dbeaver`, in no persona, and only on a GUI host. A box that has it from an earlier `developer-gui` run keeps it. + ### contributor (CI toolchain - what `hyperi-ci check` drives) `*` = blocking CI gate. diff --git a/install.sh b/install.sh index ad3c21e..31a85ce 100755 --- a/install.sh +++ b/install.sh @@ -160,7 +160,6 @@ Generic dev GUI (developer-gui): desktop GNOME / ubuntu-desktop-minimal install if missing vscode Visual Studio Code ghostty Ghostty terminal + JetBrains Mono font - dbeaver DBeaver Community DB GUI Languages (developer-; --languages [list] or developer-languages for all): developer-rust rustup + cargo tools + protoc/librdkafka build deps @@ -186,6 +185,9 @@ Packer (packer) - opt-in, in no persona: packer HashiCorp Packer from HashiCorp's repo / tap (BUSL, no open-source fork) +DBeaver (dbeaver) - opt-in, in no persona: + dbeaver DBeaver Community DB GUI + Contributor (contributor) - to work ON a HyperI product, no org policy: hyperi-ci hyperi-ci + semgrep, alint gitleaks Secret scanner