diff options
| -rw-r--r-- | dot_config/nvim/lua/plugins/lsp.lua | 3 | ||||
| -rw-r--r-- | nix/common.nix | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/dot_config/nvim/lua/plugins/lsp.lua b/dot_config/nvim/lua/plugins/lsp.lua index 98f0f66..51c8a2d 100644 --- a/dot_config/nvim/lua/plugins/lsp.lua +++ b/dot_config/nvim/lua/plugins/lsp.lua @@ -160,7 +160,7 @@ require("conform").setup({ html = { "prettier" }, javascript = { "prettier" }, typescript = { "prettier" }, - json = { "jq", "jsonlint" }, + json = { "jq" }, jsonc = { "prettier" }, just = { "just" }, markdown = { "mdformat" }, @@ -191,7 +191,6 @@ local lint = require("lint") lint.linters_by_ft = { css = { "stylelint" }, dockerfile = { "hadolint" }, - json = { "jsonlint" }, markdown = { "markdownlint" }, makefile = { "checkmake" }, yaml = { "yamllint", "yq" }, diff --git a/nix/common.nix b/nix/common.nix index 55e2d21..217d335 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -128,7 +128,11 @@ in # AI coding agents claude-code - github-copilot-cli # NB: pkgs.copilot-cli is AWS Copilot, NOT this + # github-copilot-cli intentionally not here: nixpkgs derivation (as + # of 1.0.40) fails to build on Determinate nix with EACCES on + # /var/empty/.cache (HOME not redirected during npm postinstall). + # Install manually from https://github.com/github/copilot-cli into + # /usr/local/bin/ instead. # ── LSPs / formatters / linters / DAPs ───────────────────────────────── # Replaces Mason entirely (phase p6 of the nix migration rips out @@ -158,14 +162,13 @@ in # Formatters mdformat - nodePackages.prettier + prettier shfmt stylua # Linters codespell hadolint - nodePackages.jsonlint markdownlint-cli selene shellcheck |