NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-12-08 05:03:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

languages/nix: always use conform for formatter (#1236)

Browse source
This commit is contained in:
Ching Pei Yang 2025-11-22 03:36:00 +01:00 • committed by GitHub
commit f8dc16a29f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,25 +15,11 @@
cfg = config.vim.languages.nix; cfg = config.vim.languages.nix;
formattingCmd = mkIf (cfg.format.enable && cfg.lsp.enable) {
formatting = mkMerge [
(mkIf (cfg.format.type == "alejandra") {
command = [(getExe pkgs.alejandra) "--quiet"];
})
(mkIf (cfg.format.type == "nixfmt") {
command = [(getExe pkgs.nixfmt-rfc-style)];
})
];
};
defaultServers = ["nil"]; defaultServers = ["nil"];
servers = { servers = {
nil = { nil = {
enable = true; enable = true;
cmd = [(getExe pkgs.nil)]; cmd = [(getExe pkgs.nil)];
settings = {
nil = formattingCmd;
};
filetypes = ["nix"]; filetypes = ["nix"];
root_markers = [".git" "flake.nix"]; root_markers = [".git" "flake.nix"];
}; };
@ -41,9 +27,6 @@
nixd = { nixd = {
enable = true; enable = true;
cmd = [(getExe pkgs.nixd)]; cmd = [(getExe pkgs.nixd)];
settings = {
nixd = formattingCmd;
};
filetypes = ["nix"]; filetypes = ["nix"];
root_markers = [".git" "flake.nix"]; root_markers = [".git" "flake.nix"];
}; };
@ -152,7 +135,7 @@ in {
cfg.lsp.servers; cfg.lsp.servers;
}) })
(mkIf (cfg.format.enable && !cfg.lsp.enable) { (mkIf cfg.format.enable {
vim.formatter.conform-nvim = { vim.formatter.conform-nvim = {
enable = true; enable = true;
setupOpts = { setupOpts = {