diff --git a/flake.lock b/flake.lock index 6e1db42..7aebed5 100644 --- a/flake.lock +++ b/flake.lock @@ -169,11 +169,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1700392689, - "narHash": "sha256-5eHyyjJjWOORscfN6byD4wuV6qH2g0kN+N3OP8MybL4=", + "lastModified": 1701379698, + "narHash": "sha256-u4wV7iI5XCMkj/BSyr9sih9WgevnYhw01nFWAerFEGE=", "owner": "nix-community", "repo": "nixvim", - "rev": "c2ccb2dfabbac067193119cae4fd46d78acc03a2", + "rev": "28fc85484ab827912b1785484dd709c62d9a8237", "type": "github" }, "original": { @@ -245,11 +245,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699271226, - "narHash": "sha256-8Jt1KW3xTjolD6c6OjJm9USx/jmL+VVmbooADCkdDfU=", + "lastModified": 1700922917, + "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ea758da1a6dcde6dc36db348ed690d09b9864128", + "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78", "type": "github" }, "original": { diff --git a/programs/nixvim.nix b/programs/nixvim.nix index c500304..d3356ef 100644 --- a/programs/nixvim.nix +++ b/programs/nixvim.nix @@ -249,6 +249,8 @@ in { ["@variable"] = {link = "Constant"}, ["@field"] = {link = "Constant"}, + ["@label.json"] = {link = "Constant"}, + ["@label.jsonc"] = {link = "Constant"}, ["@property"] = {link = "Constant"}, ["@property.typescript"] = {link = "@property"}, ["@lsp.type.property"] = {link = "Constant"}, @@ -372,7 +374,12 @@ in { }; formatting = { alejandra.enable = true; - prettier_d_slim.enable = true; + prettier = { + enable = true; + withArgs = '' + {extra_filetypes = {"svelte"}} + ''; + }; rustfmt.enable = true; shfmt.enable = true; stylua.enable = true; @@ -419,13 +426,20 @@ in { html.enable = true; cssls.enable = true; svelte.enable = true; - tsserver.enable = true; + tsserver = { + enable = true; + onAttach.function = "client.server_capabilities.documentFormattingProvider = false"; + }; yamlls.enable = true; jsonls.enable = true; taplo.enable = true; - rust-analyzer.enable = true; + rust-analyzer = { + enable = true; + installCargo = false; + installRustc = false; + }; pylsp.enable = true; nixd.enable = true;