From ea29d06a91fe391724692485d79717f49255837f Mon Sep 17 00:00:00 2001
From: Andrei Stoica <andrei.stoica.365@gmail.com>
Date: Thu, 25 Jan 2024 02:58:32 -0500
Subject: [PATCH] merge confilt resolved

---
 .nvchad-custom/configs/lspconfig.lua | 13 +++++++++++--
 .nvchad-custom/configs/null-ls.lua   |  3 +--
 .zshrc                               |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.nvchad-custom/configs/lspconfig.lua b/.nvchad-custom/configs/lspconfig.lua
index 516dcd2..dad4438 100644
--- a/.nvchad-custom/configs/lspconfig.lua
+++ b/.nvchad-custom/configs/lspconfig.lua
@@ -4,8 +4,17 @@ local capabilities = require("plugins.configs.lspconfig").capabilities
 local lspconfig = require("lspconfig")
 
 -- if you just want default config for the servers then put them in a table
-local servers =
-	{ "html", "cssls", "tsserver", "clangd", "docker_compose_language_service", "dockerls", "rust_analyzer", "pyright", "grammarly" }
+local servers = {
+	"html",
+	"cssls",
+	"tsserver",
+	"clangd",
+	"docker_compose_language_service",
+	"dockerls",
+	"rust_analyzer",
+	"pyright",
+	"grammarly",
+}
 
 for _, lsp in ipairs(servers) do
 	lspconfig[lsp].setup({
diff --git a/.nvchad-custom/configs/null-ls.lua b/.nvchad-custom/configs/null-ls.lua
index f364b11..8b7b7eb 100644
--- a/.nvchad-custom/configs/null-ls.lua
+++ b/.nvchad-custom/configs/null-ls.lua
@@ -7,7 +7,6 @@ end
 local b = null_ls.builtins
 
 local sources = {
-
   -- webdev stuff
   b.formatting.deno_fmt, -- choosed deno for ts/js files cuz its very fast!
   b.formatting.prettier.with { filetypes = { "html", "markdown", "css" } }, -- so prettier works only on these filetypes
@@ -27,7 +26,7 @@ local sources = {
   --     method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
   -- }),
 	
-	b.formatting.rustfmt,
+  b.formatting.rustfmt,
 }
 
 
diff --git a/.zshrc b/.zshrc
index 183bb88..20f8207 100644
--- a/.zshrc
+++ b/.zshrc
@@ -59,6 +59,7 @@ ZSH_THEME="blokkzh"
 # Add wisely, as too many plugins slow down shell startup.
 plugins=(
   git
+  zsh-fzf-history-search
 )
 
 source $ZSH/oh-my-zsh.sh