Add dadbod and dadbod ui

lazy-lock.json

@@ -1,32 +1,34 @@
 {
   "LuaSnip": { "branch": "master", "commit": "0f7bbce41ea152a94d12aea286f2ce98e63c0f58" },
   "NvChad": { "branch": "v2.5", "commit": "bbc3d43db088c141b142a40cd5f717635833a54e" },
-  "base46": { "branch": "v2.5", "commit": "8971be55aeb6d5fe086169c0ee9ce647a3871570" },
+  "base46": { "branch": "v2.5", "commit": "40943fc668bf8f1caa4cc45f71c784cf0d3cc34f" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "023f795dbcf32d4351b6a9ed2e613d471b5bb812" },
-  "core.nvim": { "branch": "main", "commit": "26ada48758e73ff3763ac134a9a0da320a7762e4" },
+  "conform.nvim": { "branch": "master", "commit": "a203480a350b03092e473bf3001733d547160a73" },
   "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
-  "gitsigns.nvim": { "branch": "main", "commit": "ac5aba6dce8c06ea22bea2c9016f51a2dbf90dc7" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
   "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" },
-  "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
+  "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "menu": { "branch": "main", "commit": "657bfc91382c0928453d9a4d0a10ec92db5de2bb" },
-  "minty": { "branch": "main", "commit": "a3d69bd63fc98f640815f94b797bf978e9193022" },
+  "minty": { "branch": "main", "commit": "b454ca0229f8e22a631fd3c014ec99973fb8cad4" },
   "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
-  "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
-  "nvim-lspconfig": { "branch": "master", "commit": "f012c1b176f0e3c71f40eb309bdec0316689462e" },
-  "nvim-tree.lua": { "branch": "master", "commit": "f7c65e11d695a084ca10b93df659bb7e68b71f9f" },
-  "nvim-treesitter": { "branch": "master", "commit": "37427012d1c77c544356bfff0c9acc88fd3256bc" },
-  "nvim-web-devicons": { "branch": "master", "commit": "e87554285f581047b1bf236794b0eb812b444b87" },
+  "nvim-cmp": { "branch": "main", "commit": "ed31156aa2cc14e3bc066c59357cc91536a2bc01" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e8f9c46c99e1901167a92ab13e2357158e5aabdb" },
+  "nvim-tree.lua": { "branch": "master", "commit": "ca7c4c33cac2ad66ec69d45e465379716ef0cc97" },
+  "nvim-treesitter": { "branch": "master", "commit": "4d035005d338e4b1eb71a175bd44974e2f64740f" },
+  "nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "projectmgr.nvim": { "branch": "main", "commit": "2d29b21b5afefa7a1690854c56db9b43195d9a10" },
   "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" },
-  "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
-  "ui": { "branch": "v3.0", "commit": "9b31c25fc497d1ef726de15ae297769dbf90c1a5" },
-  "volt": { "branch": "main", "commit": "41c03a5d6a0a8a997e774a3482d82e5ef820c6ba" },
-  "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" }
+  "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "ui": { "branch": "v3.0", "commit": "7905539f1e10f460811dc0db800355611f8a527a" },
+  "vim-dadbod": { "branch": "master", "commit": "fe5a55e92b2dded7c404006147ef97fb073d8b1b" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "28a16902cb2134c934b85da5250033ee43b0dee5" },
+  "vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" },
+  "volt": { "branch": "main", "commit": "8d35e03c70490190149a77c59155618ef4370721" },
+  "which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" }
 }

lua/configs/conform.lua

@@ -1,15 +1,64 @@
-local options = {
-  formatters_by_ft = {
-    lua = { "stylua" },
-    -- css = { "prettier" },
-    -- html = { "prettier" },
-  },
+-----------------------------------------------------------
+-- Conform.nvim Formatter Configuration
+-----------------------------------------------------------
 
-  -- format_on_save = {
-  --   -- These options will be passed to conform.format()
-  --   timeout_ms = 500,
-  --   lsp_fallback = true,
-  -- },
+local options = {
+    -- Disable LSP formatting fallback
+    lsp_fallback = false,
+
+    -----------------------------------------------------------
+    -- Formatter Assignments by File Type
+    -----------------------------------------------------------
+    formatters_by_ft = {
+        -- Lua
+        lua = { "stylua" },
+
+        -- Web Development
+        javascript =      { "prettierd", "prettier", stop_after_first = true },
+        typescript =      { "prettierd", "prettier", stop_after_first = true },
+        typescriptreact = { "prettierd", "prettier", stop_after_first = true },
+        astro =           { "prettierd", "prettier", stop_after_first = true },
+        svelte =          { "prettierd", "prettier", stop_after_first = true },
+        html =            { "prettierd", "prettier", stop_after_first = true },
+        css =             { "prettierd", "prettier", stop_after_first = true },
+        json =            { "prettierd", "prettier", stop_after_first = true },
+        yml =             { "prettierd", "prettier", stop_after_first = true },
+        toml =            { "prettierd", "prettier", stop_after_first = true },
+
+        -- Systems Programming
+        rust = { "rustfmt" },
+        c = { "clangformat" },
+        cpp = { "clangformat" },
+
+        -- Shell and Configuration
+        sh = { "shfmt" },
+        nix = { "nixpkgsfmt" },
+    },
+
+    -----------------------------------------------------------
+    -- Custom Formatter Configurations
+    -----------------------------------------------------------
+    formatters = {
+        -- Nix formatter configuration
+        nixpkgsfmt = {
+            command = "nixpkgs-fmt",
+            args = {},
+        },
+
+        -- C/C++ formatter configuration
+        clangformat = {
+            inherit = false,
+            command = "clang-format",
+        },
+    },
+
+    -----------------------------------------------------------
+    -- Format on Save Settings
+    -----------------------------------------------------------
+    format_on_save = {
+        timeout_ms = 2500,    -- Maximum time to wait for formatting
+        lsp_fallback = false, -- Don't fallback to LSP formatting
+    },
 }
 
 return options

lua/configs/lazy.lua

@@ -40,7 +40,6 @@ return {
         "optwin",
         "compiler",
         "bugreport",
-        "ftplugin",
       },
     },
   },

lua/configs/lspconfig.lua

@@ -1,24 +1,101 @@
--- load defaults i.e lua_lsp
+-----------------------------------------------------------
+-- LSP Configuration
+-----------------------------------------------------------
+
+-- Load NvChad LSP defaults
 require("nvchad.configs.lspconfig").defaults()
 
-local lspconfig = require "lspconfig"
+local lspconfig = require("lspconfig")
+local nvlsp = require("nvchad.configs.lspconfig")
 
--- EXAMPLE
-local servers = { "html", "cssls" }
-local nvlsp = require "nvchad.configs.lspconfig"
+-----------------------------------------------------------
+-- Language Server Configurations
+-----------------------------------------------------------
 
--- lsps with default config
-for _, lsp in ipairs(servers) do
-  lspconfig[lsp].setup {
-    on_attach = nvlsp.on_attach,
-    on_init = nvlsp.on_init,
-    capabilities = nvlsp.capabilities,
-  }
+local servers = {
+    -----------------------------------------------------------
+    -- Web Development
+    -----------------------------------------------------------
+    -- HTML & CSS
+    emmet_language_server = {},
+    html = {},
+    cssls = {},
+    
+    -- JavaScript & Frameworks
+    svelte = {},
+    astro = {},
+    
+    -- Tailwind CSS
+    tailwindcss = {
+        settings = {
+            tailwindCSS = {
+                experimental = {
+                    classRegex = {
+                        { "cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]" },
+                        { "cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)" },
+                        { "cn\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)" },
+                    },
+                },
+            },
+        },
+    },
+    
+    -- JSON & Linting
+    jsonls = {},
+    eslint = {},
+
+    -----------------------------------------------------------
+    -- DevOps & Infrastructure
+    -----------------------------------------------------------
+    -- Docker
+    docker_compose_language_service = {},
+    dockerls = {},
+    
+    -- Server Configuration
+    nginx_language_server = {},
+
+    -----------------------------------------------------------
+    -- Systems Programming
+    -----------------------------------------------------------
+    -- Rust
+    rust_analyzer = {},
+    
+    -- C/C++
+    clangd = {},
+    
+    -- Go
+    gopls = {},
+
+    -----------------------------------------------------------
+    -- Scripting & Configuration
+    -----------------------------------------------------------
+    -- Lua
+    lua_ls = {},
+    
+    -- Nix
+    nixd = {},
+    
+    -- C# (currently disabled)
+    -- csharp_ls = {},
+
+    -----------------------------------------------------------
+    -- Database & Backend
+    -----------------------------------------------------------
+    -- SQL
+    sqls = {},
+    
+    -- PHP
+    phpactor = {},
+}
+
+-----------------------------------------------------------
+-- Apply Server Configurations
+-----------------------------------------------------------
+
+-- Iterate through servers and apply common configuration
+for name, opts in pairs(servers) do
+    opts.on_init = nvlsp.on_init
+    opts.on_attach = nvlsp.on_attach
+    opts.capabilities = nvlsp.capabilities
+    lspconfig[name].setup(opts)
 end
-
--- configuring single server, example: typescript
--- lspconfig.ts_ls.setup {
---   on_attach = nvlsp.on_attach,
---   on_init = nvlsp.on_init,
---   capabilities = nvlsp.capabilities,
--- }

lua/mappings.lua

@@ -1,10 +1,14 @@
 require "nvchad.mappings"
 
--- add yours here
-
 local map = vim.keymap.set
 
 map("n", ";", ":", { desc = "CMD enter command mode" })
 map("i", "jk", "<ESC>")
 
--- map({ "n", "i", "v" }, "<C-s>", "<cmd> w <cr>")
+-- Easy-align mappings
+map("x", "ga", "<Plug>(EasyAlign)", { silent = true })
+map("n", "ga", "<Plug>(EasyAlign)", { silent = true })
+
+map("n", "<C-e>", function()
+  require("telescope.builtin").oldfiles()
+end, { desc = "Open recent files with Telescope" })

lua/options.lua

@@ -76,7 +76,7 @@ local opt = {
     wrapmargin = 0,               -- No margin for wrapping
     tabstop = 4,                  -- 2 spaces per tab
     shiftwidth = 0,               -- Match tabstop
-    expandtab = true,             -- Use spaces for tabs
+    expandtab = false,             -- Use spaces for tabs
     autoindent = true,            -- Maintain indent level
 
     -------------------

lua/plugins/init.lua

@@ -1,56 +1,99 @@
 return {
-  {
-    "stevearc/conform.nvim",
-    -- event = 'BufWritePre', -- uncomment for format on save
-    opts = require "configs.conform",
-  },
+	{
+		"junegunn/vim-easy-align",
+		lazy = false, -- Load the plugin immediately
+		keys = {
+			-- Custom keymappings for easy-align
+			{ "ga", "<Plug>(EasyAlign)", mode = { "n", "x" }, desc = "Easy Align" }
+		},
+	},
 
-  {
-    "charludo/projectmgr.nvim",
-    lazy = false, -- Required for proper functionality
-  },
+	{
+		'nvim-telescope/telescope.nvim',
+		tag = '0.1.8',
+		-- or                              , branch = '0.1.x',
+		dependencies = { 'nvim-lua/plenary.nvim' }
+	},
 
-  -- These are some examples, uncomment them if you want to see them work!
-  {
-    "neovim/nvim-lspconfig",
-    config = function()
-      require "configs.lspconfig"
-    end,
-  },
+	{
+		"charludo/projectmgr.nvim",
+		lazy = false,
+	},
 
--- Supermaven
-  {
-    "supermaven-inc/supermaven-nvim",
-    lazy = false,
-    config = function()
-      require("supermaven-nvim").setup {
-        keymaps = {
-          accept_suggestion = "<A-l>",
-          clear_suggestion = "<C-]>",
-          accept_word = "<C-j>",
-        },
-        ignore_filetypes = { cpp = true }, -- or { "cpp", }
-        color = {
-          suggestion_color = "#ffffff",
-          cterm = 244,
-        },
-        log_level = "info", -- set to "off" to disable logging completely
-        disable_inline_completion = false, -- disables inline completion for use with cmp
-        disable_keymaps = false, -- disables built in keymaps for more manual control
-        condition = function()
-          return false
-        end, -- condition to check for stopping supermaven, `true` means to stop supermaven when the condition is true.
-      }
-    end,
-  },
+	{
+		"neovim/nvim-lspconfig",
+		config = function()
+			require "configs.lspconfig"
+		end,
+	},
 
-  -- {
-  -- 	"nvim-treesitter/nvim-treesitter",
-  -- 	opts = {
-  -- 		ensure_installed = {
-  -- 			"vim", "lua", "vimdoc",
-  --      "html", "css"
-  -- 		},
-  -- 	},
-  -- },
+	{
+		"stevearc/conform.nvim",
+		event = "BufWritePre",
+		opts = require "configs.conform",
+	},
+
+	-- Supermaven
+	{
+		"supermaven-inc/supermaven-nvim",
+		lazy = false,
+		config = function()
+			require("supermaven-nvim").setup {
+				keymaps = {
+					accept_suggestion = "<A-l>",
+					clear_suggestion = "<C-]>",
+					accept_word = "<C-j>",
+				},
+				ignore_filetypes = { cpp = true }, -- or { "cpp", }
+				color = {
+					suggestion_color = "#ffffff",
+					cterm = 244,
+				},
+				log_level = "info",    -- set to "off" to disable logging completely
+				disable_inline_completion = false, -- disables inline completion for use with cmp
+				disable_keymaps = false, -- disables built in keymaps for more manual control
+				condition = function()
+					return false
+				end, -- condition to check for stopping supermaven, `true` means to stop supermaven when the condition is true.
+			}
+		end,
+	},
+
+	{
+		"nvim-treesitter/nvim-treesitter",
+		opts = {
+			ensure_installed = {
+				"vim", "lua", "vimdoc",
+				"html", "css"
+			},
+		},
+	},
+
+	{
+		"tpope/vim-dadbod",
+		lazy = false,
+	},
+	{
+		'kristijanhusak/vim-dadbod-ui',
+		lazy = false,
+		dependencies = {
+			'tpope/vim-dadbod',
+		},
+		cmd = {
+			'DBUI',
+			'DBUIToggle',
+			'DBUIAddConnection',
+			'DBUIFindBuffer',
+		},
+		init = function()
+			vim.g.db_ui_use_nerd_fonts = 1
+		end,
+	},
+	{
+		"kristijanhusak/vim-dadbod-completion",
+		dependencies = {
+			'kristijanhusak/vim-dadbod-ui',
+			'kristijanhusak/vim-dadbod',
+		},
+	},
 }

pero.vim

@@ -16,6 +16,10 @@ set hlsearch
 set foldmethod=indent
 set history=1000
 set nofoldenable
+set autoindent
+set tabstop=4
+set shiftwidth=4
+set noexpandtab
 
 let @q = 'GpA ^['
 let @w = 'Gpo^['