From 983b5fb5c9f8f03cf81bd508acff2f8c139f1aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20La=C3=ADn?= <sergio.lac@pm.me>
Date: Sat, 8 Jun 2024 12:40:29 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(nvim):=20extended?=
 =?UTF-8?q?=20lang=20extras=20of=20lazyvim=20included=20langs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lua/plugins/extras/lang/git-extended.lua  |  12 ++
 .config/nvim/lua/plugins/extras/lang/git.lua  |  25 ---
 .../lua/plugins/extras/lang/nix-extended.lua  |  20 +++
 .config/nvim/lua/plugins/extras/lang/nix.lua  |  51 -------
 .../lua/plugins/extras/lang/sql-extended.lua  |  52 +++++++
 .config/nvim/lua/plugins/extras/lang/sql.lua  | 144 ------------------
 .../extras/lang/web/angular-extended.lua      |  14 ++
 .../lua/plugins/extras/lang/web/angular.lua   |  36 -----
 8 files changed, 98 insertions(+), 256 deletions(-)
 create mode 100644 .config/nvim/lua/plugins/extras/lang/git-extended.lua
 delete mode 100644 .config/nvim/lua/plugins/extras/lang/git.lua
 create mode 100644 .config/nvim/lua/plugins/extras/lang/nix-extended.lua
 delete mode 100644 .config/nvim/lua/plugins/extras/lang/nix.lua
 create mode 100644 .config/nvim/lua/plugins/extras/lang/sql-extended.lua
 delete mode 100644 .config/nvim/lua/plugins/extras/lang/sql.lua
 create mode 100644 .config/nvim/lua/plugins/extras/lang/web/angular-extended.lua
 delete mode 100644 .config/nvim/lua/plugins/extras/lang/web/angular.lua

diff --git a/.config/nvim/lua/plugins/extras/lang/git-extended.lua b/.config/nvim/lua/plugins/extras/lang/git-extended.lua
new file mode 100644
index 00000000..547075de
--- /dev/null
+++ b/.config/nvim/lua/plugins/extras/lang/git-extended.lua
@@ -0,0 +1,12 @@
+return {
+  { import = "lazyvim.plugins.extras.lang.git" },
+  {
+    "luckasRanarison/nvim-devdocs",
+    optional = true,
+    opts = {
+      ensure_installed = {
+        "git",
+      },
+    },
+  },
+}
diff --git a/.config/nvim/lua/plugins/extras/lang/git.lua b/.config/nvim/lua/plugins/extras/lang/git.lua
deleted file mode 100644
index 9adc29ba..00000000
--- a/.config/nvim/lua/plugins/extras/lang/git.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-return {
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, {
-          "git_config",
-          "git_rebase",
-          "gitattributes",
-          "gitcommit",
-          "gitignore",
-        })
-      end
-    end,
-  },
-  {
-    "luckasRanarison/nvim-devdocs",
-    optional = true,
-    opts = {
-      ensure_installed = {
-        "git",
-      },
-    },
-  },
-}
diff --git a/.config/nvim/lua/plugins/extras/lang/nix-extended.lua b/.config/nvim/lua/plugins/extras/lang/nix-extended.lua
new file mode 100644
index 00000000..f1a95811
--- /dev/null
+++ b/.config/nvim/lua/plugins/extras/lang/nix-extended.lua
@@ -0,0 +1,20 @@
+return {
+  { import = "lazyvim.plugins.extras.lang.nix" },
+  {
+    "mfussenegger/nvim-lint",
+    opts = function(_, opts)
+      opts.linters_by_ft.nix = opts.linters_by_ft.nix or {}
+      table.insert(opts.linters_by_ft.nix, "statix")
+      return opts
+    end,
+  },
+  {
+    "luckasRanarison/nvim-devdocs",
+    optional = true,
+    opts = {
+      ensure_installed = {
+        "nix",
+      },
+    },
+  },
+}
diff --git a/.config/nvim/lua/plugins/extras/lang/nix.lua b/.config/nvim/lua/plugins/extras/lang/nix.lua
deleted file mode 100644
index 182c54bd..00000000
--- a/.config/nvim/lua/plugins/extras/lang/nix.lua
+++ /dev/null
@@ -1,51 +0,0 @@
-return {
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      vim.list_extend(opts.ensure_installed, {
-        "nix",
-      })
-    end,
-  },
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      vim.list_extend(opts.ensure_installed, {
-        "nil",
-      })
-    end,
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        nil_ls = {},
-      },
-    },
-  },
-  {
-    "stevearc/conform.nvim",
-    opts = function(_, opts)
-      opts.formatters_by_ft.nix = opts.formatters_by_ft.nix or {}
-      table.insert(opts.formatters_by_ft.nix, "alejandra")
-      return opts
-    end,
-  },
-  {
-    "mfussenegger/nvim-lint",
-    opts = function(_, opts)
-      opts.linters_by_ft.nix = opts.linters_by_ft.nix or {}
-      table.insert(opts.linters_by_ft.nix, "statix")
-      return opts
-    end,
-  },
-  {
-    "luckasRanarison/nvim-devdocs",
-    optional = true,
-    opts = {
-      ensure_installed = {
-        "nix",
-      },
-    },
-  },
-}
diff --git a/.config/nvim/lua/plugins/extras/lang/sql-extended.lua b/.config/nvim/lua/plugins/extras/lang/sql-extended.lua
new file mode 100644
index 00000000..eb7172ba
--- /dev/null
+++ b/.config/nvim/lua/plugins/extras/lang/sql-extended.lua
@@ -0,0 +1,52 @@
+local sql_ft = { "sql", "mysql", "plsql" }
+
+return {
+  { import = "lazyvim.plugins.extras.lang.python" },
+  {
+    "kristijanhusak/vim-dadbod-ui",
+    dependencies = {
+      { "jsborjesson/vim-uppercase-sql", ft = sql_ft },
+    },
+    keys = {
+      { "<leader>Da", "<cmd>DBUIAddConnection<cr>", desc = "Add Connection" },
+      { "<leader>Du", "<cmd>DBUIToggle<cr>", desc = "Toggle UI" },
+      { "<leader>Df", "<cmd>DBUIFindBuffer<cr>", desc = "Find Buffer" },
+      { "<leader>Dr", "<cmd>DBUIRenameBuffer<cr>", desc = "Rename Buffer" },
+      { "<leader>Dq", "<cmd>DBUILastQueryInfo<cr>", desc = "Last Query Info" },
+    },
+  },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      defaults = {
+        ["<leader>D"] = { name = " database" },
+      },
+    },
+  },
+  {
+    "williamboman/mason.nvim",
+    opts = {
+      ensure_installed = {
+        "sqlls",
+      },
+    },
+  },
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      servers = {
+        sqlls = {},
+      },
+    },
+  },
+  {
+    "luckasRanarison/nvim-devdocs",
+    optional = true,
+    opts = {
+      ensure_installed = {
+        "sqlite",
+        "postgresql-16",
+      },
+    },
+  },
+}
diff --git a/.config/nvim/lua/plugins/extras/lang/sql.lua b/.config/nvim/lua/plugins/extras/lang/sql.lua
deleted file mode 100644
index a61de3ce..00000000
--- a/.config/nvim/lua/plugins/extras/lang/sql.lua
+++ /dev/null
@@ -1,144 +0,0 @@
-local sql_ft = { "sql", "mysql", "plsql" }
-
-return {
-  {
-    "nvim-treesitter/nvim-treesitter",
-    optional = true,
-    opts = function(_, opts)
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "sql" })
-      end
-    end,
-  },
-  {
-    "folke/edgy.nvim",
-    optional = true,
-    opts = function(_, opts)
-      opts.right = opts.right or {}
-      table.insert(opts.right, {
-        title = "Database",
-        ft = "dbui",
-        pinned = true,
-        open = function()
-          vim.cmd("DBUI")
-        end,
-      })
-
-      opts.bottom = opts.bottom or {}
-      table.insert(opts.bottom, {
-        title = "DB Query Result",
-        ft = "dbout",
-      })
-    end,
-  },
-  {
-    "hrsh7th/nvim-cmp",
-    opts = function(_, opts)
-      local autocomplete_group = vim.api.nvim_create_augroup("vimrc_autocompletion", { clear = true })
-      vim.api.nvim_create_autocmd("FileType", {
-        pattern = sql_ft,
-        callback = function()
-          table.insert(opts.sources, { name = "vim-dadbod-completion" })
-        end,
-        group = autocomplete_group,
-      })
-    end,
-  },
-  {
-    "tpope/vim-dadbod",
-    cmd = { "DBUI", "DBUIToggle", "DBUIAddConnection", "DBUIFindBuffer" },
-    dependencies = {
-      { "kristijanhusak/vim-dadbod-ui" },
-      { "kristijanhusak/vim-dadbod-completion", ft = sql_ft },
-      { "jsborjesson/vim-uppercase-sql", ft = sql_ft },
-    },
-    config = function()
-      vim.g.db_ui_save_location = vim.fn.stdpath("data") .. "/db_ui"
-      vim.g.db_ui_use_nerd_fonts = true
-      vim.g.db_ui_execute_on_save = false
-      vim.g.db_ui_use_nvim_notify = true
-    end,
-    keys = {
-      { "<leader>Da", "<cmd>DBUIAddConnection<cr>", desc = "Add Connection" },
-      { "<leader>Du", "<cmd>DBUIToggle<cr>", desc = "Toggle UI" },
-      { "<leader>Df", "<cmd>DBUIFindBuffer<cr>", desc = "Find Buffer" },
-      { "<leader>Dr", "<cmd>DBUIRenameBuffer<cr>", desc = "Rename Buffer" },
-      { "<leader>Dq", "<cmd>DBUILastQueryInfo<cr>", desc = "Last Query Info" },
-    },
-  },
-  {
-    "folke/which-key.nvim",
-    opts = {
-      defaults = {
-        ["<leader>D"] = { name = " database" },
-      },
-    },
-  },
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "sqlls", "sqlfmt", "sqlfluff" })
-    end,
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        sqlls = {},
-      },
-    },
-  },
-  {
-    "mfussenegger/nvim-lint",
-    opts = function(_, opts)
-      local function add_linters(tbl)
-        for ft, linters in pairs(tbl) do
-          if opts.linters_by_ft[ft] == nil then
-            opts.linters_by_ft[ft] = linters
-          else
-            vim.list_extend(opts.linters_by_ft[ft], linters)
-          end
-        end
-      end
-
-      add_linters({
-        ["sql"] = { "sqlfluff" },
-        ["plsql"] = { "sqlfluff" },
-        ["mysql"] = { "sqlfluff" },
-      })
-
-      return opts
-    end,
-  },
-  {
-    "stevearc/conform.nvim",
-    opts = function(_, opts)
-      local function add_formatters(tbl)
-        for ft, formatters in pairs(tbl) do
-          if opts.formatters_by_ft[ft] == nil then
-            opts.formatters_by_ft[ft] = formatters
-          else
-            vim.list_extend(opts.formatters_by_ft[ft], formatters)
-          end
-        end
-      end
-
-      add_formatters({
-        ["sql"] = { "sqlfmt" },
-        ["plsql"] = { "sqlfmt" },
-        ["mysql"] = { "sqlfmt" },
-      })
-    end,
-  },
-  {
-    "luckasRanarison/nvim-devdocs",
-    optional = true,
-    opts = {
-      ensure_installed = {
-        "sqlite",
-        "postgresql-16",
-      },
-    },
-  },
-}
diff --git a/.config/nvim/lua/plugins/extras/lang/web/angular-extended.lua b/.config/nvim/lua/plugins/extras/lang/web/angular-extended.lua
new file mode 100644
index 00000000..68bb6c41
--- /dev/null
+++ b/.config/nvim/lua/plugins/extras/lang/web/angular-extended.lua
@@ -0,0 +1,14 @@
+return {
+  { import = "plugins.extras.lang.web.typescript-extended" },
+  { import = "plugins.extras.lang.web.html-css" },
+  { import = "lazyvim.plugins.extras.lang.angular" },
+  {
+    "luckasRanarison/nvim-devdocs",
+    optional = true,
+    opts = {
+      ensure_installed = {
+        "angular",
+      },
+    },
+  },
+}
diff --git a/.config/nvim/lua/plugins/extras/lang/web/angular.lua b/.config/nvim/lua/plugins/extras/lang/web/angular.lua
deleted file mode 100644
index 5450c537..00000000
--- a/.config/nvim/lua/plugins/extras/lang/web/angular.lua
+++ /dev/null
@@ -1,36 +0,0 @@
-return {
-  { import = "pugins.extras.lang.web.typescript-extended" },
-  { import = "plugins.extras.lang.web.html-css" },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "angular" })
-      end
-    end,
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        angularls = {},
-      },
-    },
-  },
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "angular-language-server" })
-    end,
-  },
-  {
-    "luckasRanarison/nvim-devdocs",
-    optional = true,
-    opts = {
-      ensure_installed = {
-        "angular",
-      },
-    },
-  },
-}