diff --git a/dots/.config/nvim/after/plugin/conform.lua b/dots/.config/nvim/after/plugin/conform.lua index 95af25d..8bc8a77 100644 --- a/dots/.config/nvim/after/plugin/conform.lua +++ b/dots/.config/nvim/after/plugin/conform.lua @@ -13,14 +13,15 @@ require("conform").setup({ gdscript = { "gdformat" }, haskell = { "ormolu" }, html = { "prettierd", "prettier", stop_after_first = true }, - lua = { "stylua" }, -- configured in stylua.toml - markdown = { "prettierd", "prettier", stop_after_first = true }, - nix = { "nixfmt" }, javascript = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true }, javascriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true }, json = { "prettierd", "prettier", stop_after_first = true }, jsonc = { "prettierd", "prettier", stop_after_first = true }, + lua = { "stylua" }, -- configured in stylua.toml + markdown = { "prettierd", "prettier", stop_after_first = true }, + nix = { "nixfmt" }, python = { "isort", "black" }, + rustfmt = { "rustfmt" }, svelte = { "eslint_d", "prettierd", "prettier", stop_after_first = true }, typescript = { "eslint_d", "prettierd", "prettier", stop_after_first = true }, typescriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true }, diff --git a/dots/.config/nvim/flake.nix b/dots/.config/nvim/flake.nix index 680fd25..3fb5b12 100644 --- a/dots/.config/nvim/flake.nix +++ b/dots/.config/nvim/flake.nix @@ -69,14 +69,15 @@ gawk gdtoolkit_4 isort - tree-sitter - ormolu - nodePackages.prettier nixd nixfmt + nodePackages.prettier + ormolu prettierd + rustfmt shellcheck-minimal stylua + tree-sitter vscode-langservers-extracted ]; }; diff --git a/flake.lock b/flake.lock index 4411701..88606ad 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1765080359, - "narHash": "sha256-BvAgmqgswcokD2eWoyO3uB1k1VTdpxDHGSx0RYRFjDg=", + "lastModified": 1765166690, + "narHash": "sha256-R3IuQUCRKilXeCwhtc8V443zRt7CIVewQ2Oa5LoXsnw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "35f8ab2ecd954b3a348aa0e253878211c48a0aa7", + "rev": "74c67b60a15ff1a55208bdd1788a5cd4bcb7481a", "type": "gitlab" }, "original": { @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", + "lastModified": 1765217760, + "narHash": "sha256-BVVyAodLcAD8KOtR3yCStBHSE0WAH/xQWH9f0qsxbmk=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "rev": "e5b1f87841810fc24772bf4389f9793702000c9b", "type": "github" }, "original": {