diff --git a/docs/TODO.md b/docs/TODO.md
index 3d41c06c..1b7144c0 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -19,9 +19,11 @@ No such key “color-scheme”
 # oVirt
 # opennebula
 # emailengine.app
-
+# Consider:
+- https://marketplace.visualstudio.com/items?itemName=asvetliakov.vscode-neovim
 CLOUDFLARE_API_TOKEN
 GMAIL_APP_PASSWORD
+# https://whatthediff.ai/
 
 ### Ensure these PATHs are added on Windows
 
diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index e46efe8f..14272b4f 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -534,6 +534,7 @@ softwareGroups:
     - shfmt
     - tflint
     - tokei
+    - trunk
     - yamllint
     - yapf
   Logging: &Logging
diff --git a/home/dot_config/Code/User/extensions.json b/home/dot_config/Code/User/extensions.json
index 41d1f209..8a02fe04 100644
--- a/home/dot_config/Code/User/extensions.json
+++ b/home/dot_config/Code/User/extensions.json
@@ -2,54 +2,106 @@
   "recommendations": [
     "Angular.ng-template",
     "attilabuti.vscode-mjml",
+    "azure-automation.vscode-azureautomation",
     "bierner.markdown-emoji",
     "ChakrounAnas.turbo-console-log",
     "ChFlick.firecode",
+    "christian-kohler.path-intellisense",
     "chrmarti.regex",
     "cweijan.vscode-mysql-client2",
     "DavidAnson.vscode-markdownlint",
     "dbaeumer.vscode-eslint",
     "denoland.vscode-deno",
+    "Trunk.io",
     "eamodio.gitlens",
     "EditorConfig.EditorConfig",
+    "eg2.vscode-npm-script",
     "ericadamski.carbon-now-sh",
     "esbenp.prettier-vscode",
     "firsttris.vscode-jest-runner",
     "formulahendry.auto-rename-tag",
     "formulahendry.code-runner",
+    "GitHub.copilot",
+    "GitHub.copilot-labs",
+    "GitHub.remotehub",
+    "GitHub.vscode-github-actions",
+    "GitHub.heygithub",
     "GitHub.vscode-pull-request-github",
     "GitLab.gitlab-workflow",
+    "gitpod.gitpod-desktop",
     "golang.Go",
     "GoogleCloudTools.cloudcode",
     "HashiCorp.terraform",
     "hediet.vscode-drawio",
     "IBM.output-colorizer",
+    "ionic.ionic",
     "JSONHero.jsonhero-vscode",
     "Kelvin.vscode-sshfs",
+    "jsayol.firebase-explorer",
     "mads-hartmann.bash-ide-vscode",
+    "genieai.chatgpt-vscode",
+    "mindaro.mindaro",
+    "ms-azuretools.vscode-apimanagement",
+    "ms-azuretools.vscode-azureappservice",
+    "ms-azuretools.vscode-azurecontainerapps",
+    "ms-azuretools.vscode-azureeventgrid",
+    "ms-azuretools.vscode-azurefunctions",
+    "ms-azuretools.vscode-azureresourcegroups",
+    "ms-azuretools.vscode-azurestaticwebapps",
+    "ms-azuretools.vscode-azurestorage",
+    "ms-azuretools.vscode-azurevirtualmachines",
+    "ms-azuretools.vscode-cosmosdb",
     "ms-azuretools.vscode-docker",
+    "ms-azuretools.vscode-logicapps",
+    "ms-edgedevtools.vscode-edge-devtools",
     "ms-kubernetes-tools.vscode-kubernetes-tools",
+    "ms-python.flake8",
     "ms-python.python",
+    "task.vscode-task",
+    "ms-vscode.azure-repos",
+    "ms-vscode.azurecli",
+    "ms-vscode.cpptools",
     "ms-vscode.live-server",
+    "ms-vscode.hexeditor",
+    "ms-vscode.PowerShell",
+    "ms-vscode.remote-explorer",
     "ms-vscode-remote.remote-containers",
     "ms-vscode-remote.remote-ssh",
     "ms-vscode-remote.remote-wsl",
-    "ms-vscode.PowerShell",
+    "ms-vscode.remote-repositories",
+    "ms-vscode.remote-server",
+    "ms-vscode.vscode-serial-monitor",
+    "ms-vscode.vscode-github-issue-notebooks",
+    "ms-vscode.vscode-node-azure-pack",
     "MS-vsliveshare.vsliveshare-audio",
     "MS-vsliveshare.vsliveshare",
+    "msjsdiag.cordova-tools",
+    "NativeScript.nativescript",
     "njpwerner.autodocstring",
     "nrwl.angular-console",
+    "Orta.vscode-jest",
     "philnash.ngrok-for-vscode",
     "PKief.material-icon-theme",
     "pranaygp.vscode-css-peek",
+    "Prisma.prisma",
     "quicktype.quicktype",
+    "RapidAPI.vscode-rapidapi-client",
     "rbbit.typescript-hero",
     "redhat.ansible",
+    "redhat.fabric8-analytics",
+    "redhat.java",
+    "redhat.vscode-knative",
+    "redhat.vscode-openshift-connector",
+    "redhat.vscode-server-connector",
+    "redhat.vscode-rsp-ui",
+    "redhat.vscode-xml",
     "redhat.vscode-yaml",
     "richie5um2.vscode-sort-json",
     "Rubymaniac.vscode-paste-and-indent",
     "salbert.comment-ts",
+    "sandcastle.vscode-open",
     "shd101wyy.markdown-preview-enhanced",
+    "snyk-security.snyk-vulnerability-scanner",
     "softwaredotcom.swdc-vscode",
     "steoates.autoimport",
     "stylelint.vscode-stylelint",
@@ -59,6 +111,9 @@
     "usernamehw.errorlens",
     "valentjn.vscode-ltex",
     "VisualStudioExptTeam.vscodeintellicode",
+    "VisualStudioExptTeam.vscodeintellicode-completions",
+    "VisualStudioExptTeam.vscodeintellicode-insiders",
+    "vsciot-vscode.azure-iot-toolkit",
     "vsciot-vscode.vscode-arduino",
     "vsls-contrib.codetour",
     "vsls-contrib.gistfs",
diff --git a/software.yml b/software.yml
index a20acb85..3f5aecc7 100644
--- a/software.yml
+++ b/software.yml
@@ -1441,6 +1441,14 @@ softwarePackages:
     _type: menubar
     cask: cumulus
     github: github.com/gillesdemey/Cumulus
+  trunk:
+    _bin: trunk
+    _desc: An all-in-one linter / code auto-fixer augmented by a freemium web service
+    _docs: https://docs.trunk.io/
+    _github:
+    _home: https://trunk.io/
+    brew: trunk-io
+    npm: '@trunkio/launcher'
   cups:
     _bin: cupsctl
     _desc: '[CUPS](https://www.cups.org/) is a modular printing system for Unix-like computer operating systems which allows a computer to act as a print server. A computer running CUPS is a host that can accept print jobs from client computers, process them, and send them to the appropriate printer.'