diff --git a/.config/helix/languages.toml b/.config/helix/languages.toml index e481298..96fba65 100644 --- a/.config/helix/languages.toml +++ b/.config/helix/languages.toml @@ -25,15 +25,6 @@ inlayHints.discriminantHints.enable = "fieldless" inlayHints.lifetimeElisionHints.enable = "skip_trivial" inlayHints.typeHints.hideClosureInitialization = false -[language-server.jinja-lsp] -command = "jinja-lsp" -config = { templates = "./templates", backend = ["./src"], lang = "rust"} -timeout = 5 - -[[language]] -name = "jinja" -language-servers = ["jinja-lsp"] - [[language]] name = "ai-chat" language-servers = ["lsp-ai"] @@ -90,6 +81,51 @@ model = "model2" max_tokens = 64 max_context = 1024 +[language-server.jinja-lsp] +command = "jinja-lsp" +config = { templates = "./templates", backend = ["./src"], lang = "rust"} +timeout = 5 + + +[[language]] +name = "jinja" +language-servers = ["jinja-lsp"] + +[[language]] +name = "python" +language-id = "python" +roots = ["pyproject.toml", "setup.py", "poetry.lock", ".git", ".jj", ".venv/"] +language-servers = ["ruff", "pyright"] +auto-format = true +# formatter = { command = "black", args = ["--quiet", "-", "--line-length=80"] } +formatter = { command = "ruff", args = ["format", "-" ] } +file-types = ["py", "ipynb"] +comment-token = "#" +shebangs = ["python"] + +[language-server.pyright] +command = "pyright-langserver" +args = ["--stdio"] + +[language-server.ruff] +command = "ruff" +args = ["server"] +environment = { "RUFF_TRACE" = "messages" } + +[language-server.ruff.config.settings] +lineLength = 80 +logLevel = "debug" + +[language-server.ruff.config.settings.lint] +# select = ["E", "F", "W", "B", "I", "RUF", "N", "LOG", "ERA", "W", "D", "UP", "ANN", "ASYNC", "S", "RET", "TCH", "ARG", "PTH", "DOC"] +preview = true + +[language-server.ruff.config.settings.format] +preview = true +# quote-style = "double" +docstring-code-format = true +# indent-style = "space" + [[language]] name = "rust" language-servers = ["rust-analyzer", "lsp-ai"] diff --git a/.profile b/.profile index bb8de48..a54399a 100755 --- a/.profile +++ b/.profile @@ -22,3 +22,5 @@ if [ -d "$HOME/bin" ] ; then fi . "$HOME/.cargo/env" + +. "$HOME/.local/share/../bin/env" diff --git a/README.org b/README.org index 51d5594..7ae4601 100644 --- a/README.org +++ b/README.org @@ -211,8 +211,11 @@ Install [[https://difftastic.wilfred.me.uk/][difftastic]] ([[https://github.com/ *** setup development stuff https://realpython.com/dependency-management-python-poetry/ +and then try =uv=: #+begin_src bash sudo dnf install python3-lsp-server+all + curl -LsSf https://astral.sh/uv/install.sh | sh + uv tool install ruff@latest #+end_src ** NEXT Moving to Guix