From 3d20c33c722a1c8989d05ff16af794751145821b Mon Sep 17 00:00:00 2001
From: Mykhailo Nikiforov <u@xaked.com>
Date: Fri, 13 Oct 2023 11:55:58 +0300
Subject: [PATCH] fix(none-ls): migrate from none-ls

---
 nvim/lua/config/lazy.lua           | 17 +++++++----------
 nvim/lua/plugins/lang/markdown.lua | 19 +++++++++++--------
 nvim/lua/plugins/lang/shell.lua    | 23 ++++++++++++++---------
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua
index ed6c943..fa72fd0 100644
--- a/nvim/lua/config/lazy.lua
+++ b/nvim/lua/config/lazy.lua
@@ -11,20 +11,17 @@ require("lazy").setup({
   spec = {
     -- add LazyVim and import its plugins
     { "LazyVim/LazyVim", import = "lazyvim.plugins" },
-    { import = "lazyvim.plugins.extras.ui.mini-animate" },
-    { import = "lazyvim.plugins.extras.lang.python" },
-    { import = "lazyvim.plugins.extras.lang.json" },
-    { import = "lazyvim.plugins.extras.lang.java" },
-    { import = "lazyvim.plugins.extras.lang.go" },
+    { import = "lazyvim.plugins.extras.coding.codeium" },
+    { import = "lazyvim.plugins.extras.lang.cmake" },
     { import = "lazyvim.plugins.extras.lang.docker" },
+    { import = "lazyvim.plugins.extras.lang.go" },
+    { import = "lazyvim.plugins.extras.lang.java" },
     { import = "lazyvim.plugins.extras.lang.json" },
+    { import = "lazyvim.plugins.extras.lang.python" },
     { import = "lazyvim.plugins.extras.lang.terraform" },
     { import = "lazyvim.plugins.extras.lang.yaml" },
-    -- TODO: remove when fixed
-    -- See https://xaked.com/xaked/nvim/issues/13
-    -- Looks like prettier is deleting end of the file randomly. It's happend in md and yaml files already
-    -- Disabling it for now
-    -- { import = "lazyvim.plugins.extras.formatting.prettier" },
+    { import = "lazyvim.plugins.extras.ui.edgy" },
+    { import = "lazyvim.plugins.extras.ui.mini-animate" },
     { import = "plugins.tokyonight" },
     { import = "plugins.telescope" },
     { import = "plugins.lang.markdown" },
diff --git a/nvim/lua/plugins/lang/markdown.lua b/nvim/lua/plugins/lang/markdown.lua
index 0119ac0..b358212 100644
--- a/nvim/lua/plugins/lang/markdown.lua
+++ b/nvim/lua/plugins/lang/markdown.lua
@@ -10,14 +10,17 @@ return {
     end,
   },
   {
-    "nvimtools/none-ls.nvim",
-    opts = function(_, opts)
-      local nls = require("null-ls")
-      opts.sources = opts.sources or {}
-      vim.list_extend(opts.sources, {
-        nls.builtins.formatting.mdformat,
-      })
-    end,
+    "stevearc/conform.nvim",
+    event = { "BufWritePre" },
+    cmd = { "ConformInfo" },
+    opts = {
+      formatters_by_ft = {
+        ["md"] = { "mdformat" },
+        ["markdown"] = { "mdformat" },
+        ["markdown.mdx"] = { "mdformat" },
+      },
+      format_on_save = { timeout_ms = 500, lsp_fallback = true },
+    },
   },
   {
     "neovim/nvim-lspconfig",
diff --git a/nvim/lua/plugins/lang/shell.lua b/nvim/lua/plugins/lang/shell.lua
index 981e22a..94c2a46 100644
--- a/nvim/lua/plugins/lang/shell.lua
+++ b/nvim/lua/plugins/lang/shell.lua
@@ -11,15 +11,20 @@ return {
     end,
   },
   {
-    "nvimtools/none-ls.nvim",
-    opts = function(_, opts)
-      local nls = require("null-ls")
-      opts.sources = opts.sources or {}
-      vim.list_extend(opts.sources, {
-        nls.builtins.code_actions.shellcheck,
-        -- nls.builtins.diagnostics.shellcheck,
-        nls.builtins.formatting.shfmt.with({ args = { "-filename", "$FILENAME", "-i", "2" } }),
-      })
+    "stevearc/conform.nvim",
+    event = { "BufWritePre" },
+    cmd = { "ConformInfo" },
+    opts = {
+      formatters_by_ft = {
+        ["sh"] = { "shfmt" },
+        ["command"] = { "shfmt" },
+      },
+      format_on_save = { timeout_ms = 500, lsp_fallback = true },
+    },
+    config = function(_, opts)
+      local util = require("conform.util")
+      util.add_formatter_args(require("conform.formatters.shfmt"), { "-i", "2" })
+      require("conform").setup(opts)
     end,
   },
   {
-- 
2.49.1