From 1ce22afe604917f1b273b7776b30c8bf60ae4450 Mon Sep 17 00:00:00 2001
From: boggs <6130147+b-ggs@users.noreply.github.com>
Date: Sun, 24 Dec 2023 02:21:26 +0800
Subject: [PATCH] Replace none-ls with conform, bump deps

---
 nvim/.config/nvim/lazy-lock.json          | 10 +++++-----
 nvim/.config/nvim/lua/plugins/conform.lua | 16 ++++++++++++++++
 nvim/.config/nvim/lua/plugins/null-ls.lua | 18 ------------------
 3 files changed, 21 insertions(+), 23 deletions(-)
 create mode 100644 nvim/.config/nvim/lua/plugins/conform.lua
 delete mode 100644 nvim/.config/nvim/lua/plugins/null-ls.lua

diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index a0cb1f9..eca9377 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -7,6 +7,7 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
+  "conform.nvim": { "branch": "master", "commit": "ce95e6b2a072d81fd312ff213f241cacab1eccef" },
   "copilot.vim": { "branch": "release", "commit": "5b19fb001d7f31c4c7c5556d7a97b243bd29f45f" },
   "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
   "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" },
@@ -16,18 +17,17 @@
   "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" },
   "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
-  "neodev.nvim": { "branch": "main", "commit": "0afdcb703f265c3079a47857bda01e3ccf884558" },
-  "neotest": { "branch": "master", "commit": "20e687744eac3c0ffa5e285c00c1f322101c944d" },
+  "neodev.nvim": { "branch": "main", "commit": "269051a7093fa481128904a33a6c4e1ca8de4340" },
+  "neotest": { "branch": "master", "commit": "6aa6e4529a4a125b49c48541b97ba146ceee2441" },
   "neotest-vim-test": { "branch": "master", "commit": "75c4228882ae4883b11bfce9b8383e637eb44192" },
-  "none-ls.nvim": { "branch": "main", "commit": "bbd8c0c2b8a47ff2e0a97868afdf3fc640f1ad1e" },
   "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
   "nvim-config-local": { "branch": "main", "commit": "83bb6d9881653a5cf8b489ba8a6fe5a06049a10a" },
   "nvim-lspconfig": { "branch": "master", "commit": "9099871a7c7e1c16122e00d70208a2cd02078d80" },
   "nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" },
   "nvim-tree.lua": { "branch": "master", "commit": "50f30bcd8c62ac4a83d133d738f268279f2c2ce2" },
-  "nvim-treesitter": { "branch": "master", "commit": "454c3a9ba86f841dc3b5bb17d150a873a16b77b4" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "c9f2b429a1d63023f7a33b5404616f4cd2a109c5" },
+  "nvim-treesitter": { "branch": "master", "commit": "c4da7945641b2e74915313cd1e608b43877a56b7" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" },
   "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" },
   "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/nvim/.config/nvim/lua/plugins/conform.lua
new file mode 100644
index 0000000..57aaddc
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/conform.lua
@@ -0,0 +1,16 @@
+return {
+  "stevearc/conform.nvim",
+  tag = "stable",
+  opts = {
+    formatters_by_ft = {
+      javascript = { "prettier" },
+      lua = { "stylua" },
+      markdown = { "prettier" },
+      python = { "ruff_fix", "ruff_format" },
+      ["*"] = { "trim_whitespace" },
+    },
+  },
+  init = function()
+    vim.keymap.set("n", "gf", ":lua require('conform').format()<CR>")
+  end,
+}
diff --git a/nvim/.config/nvim/lua/plugins/null-ls.lua b/nvim/.config/nvim/lua/plugins/null-ls.lua
deleted file mode 100644
index c49bd68..0000000
--- a/nvim/.config/nvim/lua/plugins/null-ls.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-return {
-  "nvimtools/none-ls.nvim",
-  opts = function()
-    local null_ls = require("null-ls")
-
-    return {
-      sources = {
-        null_ls.builtins.formatting.prettier,
-        null_ls.builtins.formatting.ruff,
-        null_ls.builtins.formatting.ruff_format,
-        null_ls.builtins.formatting.stylua,
-      },
-    }
-  end,
-  init = function()
-    vim.keymap.set("n", "gf", ":lua vim.lsp.buf.format()<CR>")
-  end,
-}