From 2d6840bbc63b1c6660b2635a4678fa1f8a84ad51 Mon Sep 17 00:00:00 2001 From: Raelon Date: Mon, 13 Apr 2026 19:15:07 -0400 Subject: [PATCH] Newest nvim updates --- init.lua | 1 + lsp/gdscript.lua | 9 +++++++++ lua/godot.lua | 18 ++++++++++++++++++ lua/keymaps.lua | 3 ++- lua/lsp.lua | 3 +++ 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 lsp/gdscript.lua create mode 100644 lua/godot.lua diff --git a/init.lua b/init.lua index 28e22e4..6ef10b8 100644 --- a/init.lua +++ b/init.lua @@ -8,6 +8,7 @@ require("utils.reload") -- ./lua/utils/reload.lua require("vimwiki") -- ./lua/vimwiki.lua require("keymaps") -- ./lua/keymaps.lua require("lsp") -- ./lua/lsp.lua +-- require("godot") -- ./lua/godot.lua -- require("completion") -- ./lua/completion.lua require("coc") -- ./lua/coc.lua require("treesitter") -- ./lua/treesitter.lua diff --git a/lsp/gdscript.lua b/lsp/gdscript.lua new file mode 100644 index 0000000..91e24fa --- /dev/null +++ b/lsp/gdscript.lua @@ -0,0 +1,9 @@ +local vim = vim +local port = os.getenv 'GDScript_Port' or '6005' +local cmd = vim.lsp.rpc.connect('127.0.0.1', tonumber(port)) + +return { + cmd = cmd, + filetypes = { 'gd', 'gdscript', 'gdscript3' }, + root_markers = { 'project.godot', '.git' } +} diff --git a/lua/godot.lua b/lua/godot.lua new file mode 100644 index 0000000..42d4b83 --- /dev/null +++ b/lua/godot.lua @@ -0,0 +1,18 @@ +local vim = vim +local paths_to_check = {'/', '/../'} +local is_godot_project = false +local godot_project_path = '' +local cwd = vim.fn.getcwd() + +for key, value in pairs(paths_to_check) do + if vim.uv.fs_stat(cwd .. value .. 'project.godot') then + is_godot_project = true + godot_project_path = cwd .. value + break + end +end + +local is_server_running = vim.uv.fs_stat(godot_project_path .. '/server.pipe') +if is_godot_project and not is_server_running then + vim.fn.serverstart(godot_project_path .. '/server.pipe') +end diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 6e607a0..ef547fc 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -164,7 +164,8 @@ vim.keymap.set("n", "", ":lua Snacks.picker.smart()", { desc vim.keymap.set("n", "/", ":lua Snacks.picker.grep()", { desc = "Grep" }) vim.keymap.set("n", ":", ":lua Snacks.picker.command_history()", { desc = "Command History" }) vim.keymap.set("n", "n", ":lua Snacks.picker.notifications()", { desc = "Notification History" }) -vim.keymap.set("n", "e", ":lua Snacks.explorer()", { desc = "File Explorer" }) +-- vim.keymap.set("n", "e", ":lua Snacks.explorer()", { desc = "File Explorer" }) +vim.keymap.set("n", "e", ":Lexplore", { desc = "File Explorer" }) vim.keymap.set("n", "fb", ":lua Snacks.picker.buffers()", { desc = "Buffers" }) vim.keymap.set("n", "ff", ":lua Snacks.picker.files()", { desc = "Find Files" }) vim.keymap.set("n", "fg", ":lua Snacks.picker.git_files()", { desc = "Find Git Files" }) diff --git a/lua/lsp.lua b/lua/lsp.lua index 1523f61..af345bf 100644 --- a/lua/lsp.lua +++ b/lua/lsp.lua @@ -40,6 +40,9 @@ vim.lsp.enable('basedpyright', { } }) +-- vim.lsp.config('gdscript', {}) +-- vim.lsp.enable('gdscript') + require("lsp_signature").setup({ debug = false,