initializing new branch

1 files changed, 34 insertions, 8 deletions

diff --git a/lua/talha/lazy.lua b/lua/talha/lazy.lua
index 8ac7f43..b984c54 100644
--- a/lua/talha/lazy.lua
+++ b/lua/talha/lazy.lua
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 require("lazy").setup({
   { "nvim-lua/plenary.nvim" },
@@ -7,26 +8,28 @@ require("lazy").setup({
   },
   { "nvim-treesitter/nvim-treesitter", 
     build = ":TSUpdate",
-    config = function () 
+    config = function ()
         local configs = require("nvim-treesitter.configs")
 
         configs.setup({
-            ensure_installed = { "c", "vim", "vimdoc", "query", "javascript", "typescript", "python", "cpp"},
+            ensure_installed = {
+              "c", "cpp",
+              "vim", "vimdoc", "query",
+              "javascript", "typescript",
+              "python"
+            },
             sync_install = false,
-            highlight = { 
+            highlight = {
               enable = true,
               additional_vim_regex_highlighting = false,
             },
-            indent = { enable = true },  
+            indent = { enable = true },
           })
     end
   },
   "Mofiqul/vscode.nvim",
   "theprimeagen/harpoon",
-  "mbbill/undotree",
   "tpope/vim-fugitive",
-  "neomake/neomake",
-  "ludovicchabant/vim-gutentags", 
   {
     "VonHeikemen/lsp-zero.nvim",
     branch = 'v2.x',
@@ -40,8 +43,31 @@ require("lazy").setup({
       {'hrsh7th/nvim-cmp'},     -- Required
       {'hrsh7th/cmp-nvim-lsp'}, -- Required
       {'hrsh7th/cmp-buffer'}, -- Required
-      {'hrsh7th/cmp-nvim-lua'}, 
+      {'hrsh7th/cmp-nvim-lua'},
+      {'L3MON4D3/LuaSnip'},     -- Required
+    }
+  },
+=======
+      {'hrsh7th/cmp-nvim-lua'},
       {'L3MON4D3/LuaSnip'},     -- Required
     }
   },
+  {
+    "kristijanhusak/vim-dadbod-ui",
+    dependencies = {
+      { 'tpope/vim-dadbod', lazy = true },
+      { 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql' }, lazy = true },
+    },
+    cmd = {
+      'DBUI',
+      'DBUIToggle',
+      'DBUIAddConnection',
+      'DBUIFindBuffer'
+    },
+    init = function()
+      vim.g.db_ui_use_nerd_fonts = 1
+    end,
+  }
+  --- @DISABLED
+  -- "mbbill/undotree",
 })