diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index 448cdaab..e9610ae7 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -39,8 +39,8 @@
     "plugins.extras.editor.multicursor",
     "plugins.extras.editor.numb",
     "plugins.extras.editor.smart-splits",
-    "plugins.extras.lang.db",
     "plugins.extras.lang.markdown",
+    "plugins.extras.lang.sql",
     "plugins.extras.lang.typescript",
     "plugins.extras.lang.web",
     "plugins.extras.lsp.compiler",
@@ -79,4 +79,4 @@
     "NEWS.md": "2123"
   },
   "version": 2
-}
+}
\ No newline at end of file
diff --git a/.config/nvim/lua/plugins/extras/lang/db.lua b/.config/nvim/lua/plugins/extras/lang/sql.lua
similarity index 65%
rename from .config/nvim/lua/plugins/extras/lang/db.lua
rename to .config/nvim/lua/plugins/extras/lang/sql.lua
index c975f1f0..04804700 100644
--- a/.config/nvim/lua/plugins/extras/lang/db.lua
+++ b/.config/nvim/lua/plugins/extras/lang/sql.lua
@@ -1,18 +1,49 @@
 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,
+  },
   {
     "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 },
     },
-    cmd = { "DBUI", "DBUIToggle", "DBUIAddConnection", "DBUIFindBuffer" },
     init = function()
-      vim.g.db_ui_use_nerd_fonts = true
       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
 
       vim.api.nvim_create_autocmd("FileType", {
         pattern = sql_ft,