From 0bdc8841dca758b559935dd2ddabf8101d7de8a5 Mon Sep 17 00:00:00 2001
From: DarthMooMancer <107283522+DarthMooMancer@users.noreply.github.com>
Date: Wed, 5 Mar 2025 09:13:48 -0500
Subject: [PATCH] Update init.lua

---
 lua/Javanvim/init.lua | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/lua/Javanvim/init.lua b/lua/Javanvim/init.lua
index c915648..f8bd464 100644
--- a/lua/Javanvim/init.lua
+++ b/lua/Javanvim/init.lua
@@ -22,6 +22,17 @@ M.config = {
 }
 
 function M.setup(opts)
+  -- Clear previous keybindings before setting new ones
+  for key, _ in pairs(M.config.keybinds) do
+    vim.keymap.del("n", key)
+  end
+
+  -- Merge configs, replacing keybinds table completely if new one is provided
+  if opts and opts.keybinds then
+    M.config.keybinds = vim.tbl_extend("force", M.config.keybinds, opts.keybinds)
+  end
+
+  -- Merge other config settings
   M.config = vim.tbl_deep_extend("force", M.config, opts or {})
 
   -- Apply keybindings dynamically
@@ -40,6 +51,26 @@ function M.setup(opts)
   vim.api.nvim_create_user_command("JavaRun", M.run, {})
 end
 
+
+-- function M.setup(opts)
+--   M.config = vim.tbl_deep_extend("force", M.config, opts or {})
+--
+--   -- Apply keybindings dynamically
+--   for key, command in pairs(M.config.keybinds) do
+--     if command == "CloseTerminal" then
+--       M.close_key = key
+--     else
+--       vim.keymap.set("n", key, ":" .. command .. "<CR>", { silent = true })
+--     end
+--   end
+--
+--   -- Register user commands
+--   vim.api.nvim_create_user_command("NewJavaProject", M.create_project, {})
+--   vim.api.nvim_create_user_command("NewJavaFile", M.create_new_file, {})
+--   vim.api.nvim_create_user_command("JavaBuild", M.build, {})
+--   vim.api.nvim_create_user_command("JavaRun", M.run, {})
+-- end
+
 -- Open floating terminal
 local function open_float_terminal(cmd)
   local ui = vim.api.nvim_list_uis()[1]