diff --git a/modules/applications/vim/home/default.nix b/modules/applications/vim/home/default.nix index b2a1060..9eadde3 100644 --- a/modules/applications/vim/home/default.nix +++ b/modules/applications/vim/home/default.nix @@ -52,6 +52,7 @@ in stylua shfmt alejandra + nixfmt-rfc-style lua-language-server nixd ]; diff --git a/modules/applications/vim/home/plugins/editor/conform.nix b/modules/applications/vim/home/plugins/editor/conform.nix index d85945f..6f4bb62 100644 --- a/modules/applications/vim/home/plugins/editor/conform.nix +++ b/modules/applications/vim/home/plugins/editor/conform.nix @@ -15,17 +15,7 @@ _: { sh = [ "shfmt" ]; }; formatters.nix_fmt = { - command = "nix"; - args = [ - "fmt" - "$FILENAME" - ]; - stdin = false; - condition.__raw = '' - function() - return vim.fn.executable("nix") == 1 and vim.fn.filereadable(vim.fn.findfile("flake.nix", ".;")) == 1 - end - ''; + command = "nixfmt"; }; format_on_save.__raw = '' function(_)