Improve the db with completition and status line

6 files changed, 35 insertions, 18 deletions

diff --git a/after/ftplugin/dbout.vim b/after/ftplugin/dbout.vim
index 07f5afb..e181ecc 100644
--- a/after/ftplugin/dbout.vim
+++ b/after/ftplugin/dbout.vim
@@ -1 +1,2 @@
 set nofoldenable
+set colorcolumn=
diff --git a/after/plugin/completition.lua b/after/plugin/completition.lua
index 6b3dd22..1b403f1 100644
--- a/after/plugin/completition.lua
+++ b/after/plugin/completition.lua
@@ -73,6 +73,7 @@ cmp.setup {
                 nvim_lua = "[api]",
                 path = "[path]",
                 luasnip = "[snip]",
+                ["vim-dadbod-completion"] = "[DB]",
                 -- copilot = "[copilot]",
             }
         }
@@ -84,6 +85,17 @@ cmp.setup {
         ghost_text = true,
     }
 }
+
+vim.api.nvim_create_autocmd(
+    "FileType",
+    {
+        pattern = "sql,mysql,plsql",
+        callback = function()
+            require('cmp').setup.buffer({ sources = {{ name = 'vim-dadbod-completion' }} })
+        end
+    }
+)
+
 -- Setup lspconfig.
   local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
   -- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
diff --git a/after/plugin/dbui.lua b/after/plugin/dbui.lua
index eaa141c..7715875 100644
--- a/after/plugin/dbui.lua
+++ b/after/plugin/dbui.lua
@@ -1,6 +1,8 @@
 vim.g.db_ui_use_nerd_fonts = 1
 vim.g.db_ui_show_database_icon = 1
 vim.g.db_ui_force_echo_notifications = 1
+vim.g.db_ui_win_position = 'right'
+vim.g.db_ui_winwidth = 80
 
 vim.g.db_ui_table_helpers = {
     mysql = {
diff --git a/after/plugin/lualine.lua b/after/plugin/lualine.lua
index 5a10c46..948c493 100644
--- a/after/plugin/lualine.lua
+++ b/after/plugin/lualine.lua
@@ -12,7 +12,7 @@ lualine.setup{
     extensions = {'quickfix', 'fugitive'},
     sections = {
       lualine_a = { { 'mode', upper = true } },
-      lualine_b = { { 'branch', icon = '' }, 'diff' },
+      lualine_b = { { 'branch', icon = '' }, { 'db_ui#statusline' }, 'diff' },
       lualine_c = { { 'filename', file_status = true, path = 1 } },
       lualine_x = { { 'diagnostics', sources = { 'nvim_diagnostic' } },'encoding', 'fileformat', 'filetype' },
       lualine_y = { 'progress' },
diff --git a/lua/alpha/plugins.lua b/lua/alpha/plugins.lua
index 042791f..312d30a 100644
--- a/lua/alpha/plugins.lua
+++ b/lua/alpha/plugins.lua
@@ -186,6 +186,7 @@ return require("packer").startup(function(use)
 		"kristijanhusak/vim-dadbod-ui",
 		requires = {
 			"tpope/vim-dadbod",
+			"kristijanhusak/vim-dadbod-completion",
 			"tpope/vim-dotenv",
 		},
 	})
diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua
index aa509ad..aa318d7 100644
--- a/plugin/packer_compiled.lua
+++ b/plugin/packer_compiled.lua
@@ -279,6 +279,11 @@ _G.packer_plugins = {
     path = "/home/alpha/.local/share/nvim/site/pack/packer/start/refactoring.nvim",
     url = "https://github.com/ThePrimeagen/refactoring.nvim"
   },
+  ["rest.nvim"] = {
+    loaded = true,
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/rest.nvim",
+    url = "https://github.com/NTBBloodbath/rest.nvim"
+  },
   ["telescope-dap.nvim"] = {
     loaded = true,
     path = "/home/alpha/.local/share/nvim/site/pack/packer/start/telescope-dap.nvim",
@@ -344,6 +349,11 @@ _G.packer_plugins = {
     path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-dadbod",
     url = "https://github.com/tpope/vim-dadbod"
   },
+  ["vim-dadbod-completion"] = {
+    loaded = true,
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-dadbod-completion",
+    url = "https://github.com/kristijanhusak/vim-dadbod-completion"
+  },
   ["vim-dadbod-ui"] = {
     loaded = true,
     path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-dadbod-ui",
@@ -369,14 +379,6 @@ _G.packer_plugins = {
     path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-fugitive",
     url = "https://github.com/tpope/vim-fugitive"
   },
-  ["vim-http"] = {
-    commands = { "Http" },
-    loaded = false,
-    needs_bufread = true,
-    only_cond = false,
-    path = "/home/alpha/.local/share/nvim/site/pack/packer/opt/vim-http",
-    url = "https://github.com/nicwest/vim-http"
-  },
   ["vim-laravel"] = {
     loaded = true,
     path = "/home/alpha/.local/share/nvim/site/pack/packer/start/vim-laravel",
@@ -433,23 +435,22 @@ _G.packer_plugins = {
 }
 
 time([[Defining packer_plugins]], false)
--- Config for: nvim-colorizer.lua
-time([[Config for nvim-colorizer.lua]], true)
-try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14colorizer\frequire\0", "config", "nvim-colorizer.lua")
-time([[Config for nvim-colorizer.lua]], false)
--- Config for: nvim-projectconfig
-time([[Config for nvim-projectconfig]], true)
-try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\23nvim-projectconfig\frequire\0", "config", "nvim-projectconfig")
-time([[Config for nvim-projectconfig]], false)
 -- Config for: git-worktree.nvim
 time([[Config for git-worktree.nvim]], true)
 try_loadstring("\27LJ\2\n>\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\17git-worktree\frequire\0", "config", "git-worktree.nvim")
 time([[Config for git-worktree.nvim]], false)
+-- Config for: nvim-projectconfig
+time([[Config for nvim-projectconfig]], true)
+try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\23nvim-projectconfig\frequire\0", "config", "nvim-projectconfig")
+time([[Config for nvim-projectconfig]], false)
+-- Config for: nvim-colorizer.lua
+time([[Config for nvim-colorizer.lua]], true)
+try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14colorizer\frequire\0", "config", "nvim-colorizer.lua")
+time([[Config for nvim-colorizer.lua]], false)
 
 -- Command lazy-loads
 time([[Defining lazy-load commands]], true)
 pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file VimwikiIndex lua require("packer.load")({'vimwiki'}, { cmd = "VimwikiIndex", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
-pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Http lua require("packer.load")({'vim-http'}, { cmd = "Http", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
 time([[Defining lazy-load commands]], false)
 
 vim.cmd [[augroup packer_load_aucmds]]