feat(nvim): update conform.nvim and its settings

Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
caarlos0 · Jan 29, 2024 · 0a32108 · 0a32108
1 parent 706049a
commit 0a32108
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/modules/neovim/config/lua/user/conform.lua b/modules/neovim/config/lua/user/conform.lua
@@ -3,20 +3,20 @@ conform.setup({
   formatters_by_ft = {
     css = { "prettier" },
     fish = { "fish_indent" },
-    go = { "gofumpt", "injected" },
+    go = { "gofmt", "gofumpt", "injected" },
     html = { "prettier", "injected" },
     javascript = { "prettier" },
     json = { "jq" },
     lua = { "stylua" },
-    markdown = { "prettier" },
+    markdown = { "prettier", "injected" },
     nix = { "nixpkgs_fmt" },
     rust = { "rustfmt" },
     sh = { "shfmt" },
     sql = { "pg_format", "sql_formatter" },
     tf = { "terraform_fmt" },
     yaml = { "prettier" },
     zig = { "zigfmt" },
-    ["_"] = { "trim_whitespace" },
+    ["_"] = { "trim_whitespace", "trim_newlines" },
   },
   format_on_save = {
     lsp_fallback = true,

diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
@@ -56,8 +56,7 @@ in
 
       # coding
       nvim-lspconfig
-      (fromGitHub "stevearc" "conform.nvim" "v4.0.0"
-        "sha256-fcifkP2beaHRIsyZbqk4fdryvXxTJfPGE7dwZ51ENTc=")
+      conform-nvim
       nvim-cmp
       cmp-buffer
       cmp-path