Fix theme key and testing yazi

.gitignore

@@ -8,3 +8,5 @@ plug.vim.old
 .netrwhist
 pack/
 plugin/
+db_ui
+db_ui/

lazy-lock.json

@@ -2,7 +2,6 @@
   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
   "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
   "arrow.nvim": { "branch": "master", "commit": "9d98760d9a195174a24b6ccc20217bc98f3596e0" },
-  "barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
   "blame.nvim": { "branch": "main", "commit": "562661972085a273914c8f702b11924f8aa573ea" },
   "close-buffers.nvim": { "branch": "master", "commit": "3acbcad1211572342632a6c0151f839e7dead27f" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
@@ -16,6 +15,7 @@
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
   "co-author.nvim": { "branch": "main", "commit": "62fbb6d6a58339c968bcea92d0f097f4ea1efaa5" },
   "csv.vim": { "branch": "master", "commit": "962f88787ec6873eba1c7dbbd81d2723f1ee3c4b" },
+  "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
   "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" },
   "edgy.nvim": { "branch": "main", "commit": "0b35dc6da4cae6cc2f724bc610eadf955cd2319b" },
   "faster.nvim": { "branch": "main", "commit": "2047c01f4fb6ca314b922a1be457450a0592bb1a" },
@@ -33,7 +33,7 @@
   "multicursors.nvim": { "branch": "main", "commit": "8b3e14682eed06a532b155c7eae33e174846b3fd" },
   "neo-tree-diagnostics.nvim": { "branch": "main", "commit": "e00434c3cf8637bcaf70f65c2b9d82b0cc9bd7dc" },
   "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
-  "nui.nvim": { "branch": "main", "commit": "fbb139c6f14896b434d0229099e1acd863ae6bec" },
+  "nui.nvim": { "branch": "main", "commit": "756c59f46057cd2d43619cd3a6d4e01b2aa60295" },
   "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
   "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" },
   "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
@@ -42,16 +42,18 @@
   "nvim-dap-virtual-text": { "branch": "master", "commit": "a5fc69240869c0fee8ff176bc9e4efdf8bdfb596" },
   "nvim-highlight-colors": { "branch": "main", "commit": "a9f191d5ba27a5943b8992bf618858fa7374758f" },
   "nvim-hlslens": { "branch": "main", "commit": "e4c811a401b06f86a7bb042b1d64a5cba21729a9" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b1fc956fb28ee4284ae3e10fe886d01dd3c8f094" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e5e600232188ed9fb960f5df6bb06084ae8bf3ec" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
   "nvim-neoclip.lua": { "branch": "main", "commit": "798cd0592a81c185465db3a091a0ff8a21af60fd" },
   "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
   "nvim-spectre": { "branch": "master", "commit": "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf" },
   "nvim-spider": { "branch": "main", "commit": "b369f24ac107b903cd73f9f0f5f326d8629bde28" },
   "nvim-toggleterm.lua": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" },
-  "nvim-treesitter": { "branch": "master", "commit": "cc6b108ea1251bd361f091b7d5a0dd41c04f8611" },
+  "nvim-treesitter": { "branch": "master", "commit": "c09932bd2de01dc9c01e870fe83060693c67de13" },
   "nvim-ufo": { "branch": "main", "commit": "239ae620d818ffa1319ca3056546df71906d4bfb" },
   "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" },
+  "oil-vcs-status": { "branch": "main", "commit": "1861ad95734b438e7ff64eee4706c564c044c130" },
+  "oil.nvim": { "branch": "master", "commit": "18dfd2458dc741fea683357a17aaa95870b25a3c" },
   "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" },
@@ -70,6 +72,9 @@
   "vim-bufsurf": { "branch": "master", "commit": "e6dbc7ad66c7e436e5eb20d304464e378bd7f28c" },
   "vim-bundler": { "branch": "master", "commit": "c261509e78fc8dc55ad1fcf3cd7cdde49f35435c" },
   "vim-capslock": { "branch": "master", "commit": "2bd1d47d35ac489b150d284141b6dce743a307f5" },
+  "vim-dadbod": { "branch": "master", "commit": "54a15597d820f17606dc79950bf7033fcff73729" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "165699c573469e6a95b48d35052f848c340c5911" },
   "vim-dispatch": { "branch": "master", "commit": "4c695bc052cad2ae6b980aebbe48d046466e27ae" },
   "vim-endwise": { "branch": "master", "commit": "3719ffddb5e42bf67b55b2183d7a6fb8d3e5a2b8" },
   "vim-gutentags": { "branch": "master", "commit": "aa47c5e29c37c52176c44e61c780032dfacef3dd" },

lua/config/plugins.lua

@@ -11,11 +11,11 @@ return {
     priority = 1000,
      config = function()
        require('config.colorschemes.tokyonight')
-       -- require('config.colorschemes.onedarkpro')
+       -- vim.cmd [[colorscheme onedark]]
        -- require('config.colorschemes.monokai_pro')
        -- require('config.colorschemes.kanagawa')
        -- require('config.colorschemes.gruvbox_material')
-       -- require('config.colorschemes.github_nvim_theme')
+       -- vim.cmd [[colorscheme github_dark_dimmed]]
      end,
   },
   --[[ END COLORSCHEME ]]
@@ -527,6 +527,9 @@ return {
     event = 'VeryLazy',
     cmd = "Yazi",
     opts = {
+      command_args = {
+       open_dir = vim.api.nvim_buf_get_name(0),
+      },
       title = "",
       border = { "┏", "━", "┓", "┃", "┛","━", "┗", "┃" },
     },
@@ -561,7 +564,21 @@ return {
     "FabijanZulj/blame.nvim",
     event = 'VeryLazy',
     keys = {
-      { "<leader>bl", "<cmd>ToggleBlame virtual<CR>", desc = "Git blame" },
+      { "<leader>gb", "<cmd>ToggleBlame virtual<CR>", desc = "Git blame" },
     },
+  },
+  {
+    "sindrets/diffview.nvim",
+    lazy = true,
+    cmd = { "DiffviewOpen", "DiffviewClose" },
+    config = function()
+      require("diffview").setup({
+        view = {
+          file_history = {
+            layout = "diff2_vertical",
+          },
+        },
+      })
+    end
   }
 }

lua/config/plugins/dadbod.lua

@@ -0,0 +1,41 @@
+return {
+	"tpope/vim-dadbod",
+	dependencies = {
+		"kristijanhusak/vim-dadbod-ui",
+		"kristijanhusak/vim-dadbod-completion",
+	},
+	opts = {
+		db_competion = function()
+			---@diagnostic disable-next-line
+			require("cmp").setup.buffer { sources = { { name = "vim-dadbod-completion" } } }
+		end,
+	},
+	config = function(_, opts)
+    vim.g.db_ui_use_nerd_fonts = 1
+		vim.g.db_ui_save_location = vim.fn.stdpath "config" .. require("plenary.path").path.sep .. "db_ui"
+
+		vim.api.nvim_create_autocmd("FileType", {
+			pattern = {
+				"sql",
+			},
+			command = [[setlocal omnifunc=vim_dadbod_completion#omni]],
+		})
+
+		vim.api.nvim_create_autocmd("FileType", {
+			pattern = {
+				"sql",
+				"mysql",
+				"plsql",
+			},
+			callback = function()
+				vim.schedule(opts.db_completion)
+			end,
+		})
+	end,
+	keys = {
+		{ "<leader>dt", "<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" },
+	},
+}

lua/config/plugins/lualine.lua

@@ -38,20 +38,24 @@ function M.config()
   })
 
   local lazy = require("lazy.status")
-  local colors = require("tokyonight.colors").setup({ transform = true })
-  -- local colors = {
-  --   bg = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Normal", link = false }).bg),
-  --   fg = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Normal", link = false }).fg),
-  --   black = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "EndOfBuffer", link = false }).fg),
-  --   white = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Normal", link = false }).fg),
-  --   red = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Error", link = false }).fg),
-  --   green = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "String", link = false }).fg),
-  --   blue = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Folded", link = false }).fg),
-  --   yellow = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "TSRainbowYellow", link = false }).fg),
-  --   cyan = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Keyword", link = false }).fg),
-  --   orange = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "MatchParen", link = false }).fg),
-  --   purple = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "IblScope", link = false }).fg),
-  -- }
+  local colors = {}
+  if package.loaded["tokyonight"] then
+    colors = require("tokyonight.colors").setup({ transform = true })
+  else
+    colors = {
+      bg = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Normal", link = false }).bg),
+      fg = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Normal", link = false }).fg),
+      black = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "EndOfBuffer", link = false }).fg),
+      white = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Normal", link = false }).fg),
+      red = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Error", link = false }).fg),
+      green = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "String", link = false }).fg),
+      blue = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Question", link = false }).fg),
+      yellow = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Type", link = false }).fg),
+      cyan = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Keyword", link = false }).fg),
+      orange = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Title", link = false }).fg),
+      purple = string.format('#%06x', vim.api.nvim_get_hl(0, { name = "Todo", link = false }).fg),
+    }
+  end
   local filename_with_icon = require("lualine.components.filename"):extend()
   filename_with_icon.apply_icon = require("lualine.components.filetype").apply_icon
   filename_with_icon.icon_hl_cache = {}
@@ -121,7 +125,7 @@ function M.config()
       section_separators = { left = '', right = ''},
       disabled_filetypes = {
         statusline = { "alpha" },
-        winbar = { "alpha", "edgy", "toggleterm", "Trouble", "spectre_panel", "qf", "noice" },
+        winbar = { "alpha", "edgy", "toggleterm", "Trouble", "spectre_panel", "qf", "noice", "dbui" },
       },
       ignore_focus = {},
       always_divide_middle = true,