NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-02-24 20:38:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge 617cc7d482 into 94d2b837cf

Browse source
This commit is contained in:
Anthony 2024-10-14 21:50:20 +00:00 • committed by GitHub
commit aeeadf9631
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/release-notes/rl-0.7.md
View file

@ -65,6 +65,10 @@ everyone.
## Changelog {#sec-release-0.7-changelog} ## Changelog {#sec-release-0.7-changelog}
[nezia1](https://github.com/nezia1):
- Replace [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt) with [nixfmt](https://github.com/NixOS/nixfmt) (nixfmt-rfc-style).
[ItsSorae](https://github.com/ItsSorae): [ItsSorae](https://github.com/ItsSorae):
- Add support for [typst](https://typst.app/) under `vim.languages.typst` This - Add support for [typst](https://typst.app/) under `vim.languages.typst` This

20
modules/plugins/languages/nix.nix
View file

@ -27,12 +27,12 @@
servers = { servers = {
rnix = { rnix = {
package = pkgs.rnix-lsp; package = pkgs.rnix-lsp;
internalFormatter = cfg.format.type == "nixpkgs-fmt"; internalFormatter = cfg.format.type == "nixfmt";
lspConfig = '' lspConfig = ''
lspconfig.rnix.setup{ lspconfig.rnix.setup{
capabilities = capabilities, capabilities = capabilities,
${ ${
if (cfg.format.enable && cfg.format.type == "nixpkgs-fmt") if (cfg.format.enable && cfg.format.type == "nixfmt")
then useFormat then useFormat
else noFormat else noFormat
}, },
@ -62,10 +62,10 @@
command = {"${cfg.format.package}/bin/alejandra", "--quiet"}, command = {"${cfg.format.package}/bin/alejandra", "--quiet"},
}, },
''} ''}
${optionalString (cfg.format.type == "nixpkgs-fmt") ${optionalString (cfg.format.type == "nixfmt")
'' ''
formatting = { formatting = {
command = {"${cfg.format.package}/bin/nixpkgs-fmt"}, command = {"${cfg.format.package}/bin/nixfmt"},
}, },
''} ''}
}, },
@ -90,9 +90,9 @@
''; '';
}; };
nixpkgs-fmt = { nixfmt = {
package = pkgs.nixpkgs-fmt; package = pkgs.nixfmt-rfc-style;
# Never need to use null-ls for nixpkgs-fmt # Never need to use null-ls for nixfmt
}; };
}; };
@ -175,6 +175,12 @@ in {
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
{ {
assertions = [
{
assertion = cfg.format.type != "nixpkgs-fmt";
message = "nixpkgs-fmt has been deprecated.";
}
];
vim.pluginRC.nix = '' vim.pluginRC.nix = ''
vim.api.nvim_create_autocmd("FileType", { vim.api.nvim_create_autocmd("FileType", {
pattern = "nix", pattern = "nix",