diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1638c1f..4a9a253 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -32,7 +32,6 @@ "extensions": [ "astral-sh.ty", "charliermarsh.ruff", - "dorzey.vscode-sqlfluff", "exiasr.hadolint", "kevinrose.vsc-python-indent", "mosapride.zenkaku", @@ -42,6 +41,7 @@ "njpwerner.autodocstring", "redhat.vscode-yaml", "shardulm94.trailing-spaces", + "sqlfluff.vscode-sqlfluff", "streetsidesoftware.code-spell-checker", "tamasfe.even-better-toml", "yzhang.markdown-all-in-one" @@ -52,7 +52,7 @@ "DISPLAY": "dummy", "UV_PROJECT_ENVIRONMENT": "${containerWorkspaceFolder}/.venv" }, - "updateContentCommand": "sudo chown -R vscode /home/${remoteUser}/.cache /home/${remoteUser}/.ssh ${containerWorkspaceFolder}/.venv", + "updateContentCommand": "sudo chown -R vscode /home/vscode/.cache /home/vscode/.ssh ${containerWorkspaceFolder}/.venv", "postCreateCommand": "uv sync --frozen", "postStartCommand": "uv run pre-commit install" } diff --git a/.vscode/cspell.json b/.vscode/cspell.json index 2c53578..1aa71c5 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -30,7 +30,6 @@ "dmypy", "dockerfiles", "donotpresent", - "dorzey", "exiasr", "fastapi", "fontawesome", diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 1938f14..f986eff 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,7 +3,6 @@ "astral-sh.ty", "charliermarsh.ruff", "codezombiech.gitignore", - "dorzey.vscode-sqlfluff", "eamodio.gitlens", "exiasr.hadolint", "kevinrose.vsc-python-indent", @@ -17,6 +16,7 @@ "pkief.material-icon-theme", "redhat.vscode-yaml", "shardulm94.trailing-spaces", + "sqlfluff.vscode-sqlfluff", "streetsidesoftware.code-spell-checker", "tamasfe.even-better-toml", "usernamehw.errorlens", diff --git a/.vscode/settings.json b/.vscode/settings.json index 2e2a9c5..6f05c58 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,7 @@ { + "editor.autoIndent": "advanced", + "editor.formatOnSave": true, + "editor.insertSpaces": true, "files.insertFinalNewline": true, "files.trimTrailingWhitespace": true, "notebook.codeActionsOnSave": { @@ -25,36 +28,19 @@ } }, "[dockercompose]": { - "editor.autoIndent": "advanced", "editor.defaultFormatter": "redhat.vscode-yaml", - "editor.formatOnSave": true, - "editor.insertSpaces": true, - "editor.quickSuggestions": { - "other": true, - "comments": false, - "strings": true - }, "editor.tabSize": 4 }, "[dockerfile]": { "editor.defaultFormatter": "ms-azuretools.vscode-docker", - "editor.formatOnSave": true + "editor.tabSize": 4 }, "[github-actions-workflow]": { - "editor.autoIndent": "advanced", "editor.defaultFormatter": "redhat.vscode-yaml", - "editor.insertSpaces": true, - "editor.quickSuggestions": { - "other": true, - "comments": false, - "strings": true - }, "editor.tabSize": 2 }, "[json][jsonc]": { "editor.defaultFormatter": "vscode.json-language-features", - "editor.formatOnSave": true, - "editor.insertSpaces": true, "editor.tabSize": 4 }, "[python]": { @@ -63,25 +49,18 @@ "source.organizeImports": "explicit" }, "editor.defaultFormatter": "charliermarsh.ruff", - "editor.formatOnSave": true, "editor.tabSize": 4 }, "[sql]": { - "editor.defaultFormatter": "dorzey.vscode-sqlfluff", - "editor.formatOnSave": true, + "editor.defaultFormatter": "sqlfluff.vscode-sqlfluff", "editor.tabSize": 2 }, "[toml]": { "editor.defaultFormatter": "tamasfe.even-better-toml", - "editor.formatOnSave": true, - "editor.insertSpaces": true, "editor.tabSize": 4 }, "[yaml]": { - "editor.autoIndent": "advanced", "editor.defaultFormatter": "redhat.vscode-yaml", - "editor.formatOnSave": true, - "editor.insertSpaces": true, "editor.tabSize": 2 } } diff --git a/docs/configurations/uv.md b/docs/configurations/uv.md index 280bd24..1dfad60 100644 --- a/docs/configurations/uv.md +++ b/docs/configurations/uv.md @@ -40,7 +40,6 @@ Set the `UV_PROJECT_ENVIRONMENT` not to create a virtual environment in the proj "extensions": [ "astral-sh.ty", "charliermarsh.ruff", - "dorzey.vscode-sqlfluff", "exiasr.hadolint", "kevinrose.vsc-python-indent", "mosapride.zenkaku", @@ -51,6 +50,7 @@ Set the `UV_PROJECT_ENVIRONMENT` not to create a virtual environment in the proj "njpwerner.autodocstring", "redhat.vscode-yaml", "shardulm94.trailing-spaces", + "sqlfluff.vscode-sqlfluff", "streetsidesoftware.code-spell-checker", "tamasfe.even-better-toml", "yzhang.markdown-all-in-one"