Compare commits

2 Commits

Author SHA1 Message Date
9b300a2eeb Merge pull request 'Newest nvim updates' (#2) from fixthis into master
Reviewed-on: #2
2026-04-13 19:20:00 -04:00
Raelon
2d6840bbc6 Newest nvim updates 2026-04-13 19:15:07 -04:00
5 changed files with 33 additions and 1 deletions

View File

@@ -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

9
lsp/gdscript.lua Normal file
View File

@@ -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' }
}

18
lua/godot.lua Normal file
View File

@@ -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

View File

@@ -164,7 +164,8 @@ vim.keymap.set("n", "<leader><space>", ":lua Snacks.picker.smart()<cr>", { desc
vim.keymap.set("n", "<leader>/", ":lua Snacks.picker.grep()<cr>", { desc = "Grep" })
vim.keymap.set("n", "<leader>:", ":lua Snacks.picker.command_history()<cr>", { desc = "Command History" })
vim.keymap.set("n", "<leader>n", ":lua Snacks.picker.notifications()<cr>", { desc = "Notification History" })
vim.keymap.set("n", "<leader>e", ":lua Snacks.explorer()<cr>", { desc = "File Explorer" })
-- vim.keymap.set("n", "<leader>e", ":lua Snacks.explorer()<cr>", { desc = "File Explorer" })
vim.keymap.set("n", "<leader>e", ":Lexplore<cr>", { desc = "File Explorer" })
vim.keymap.set("n", "<leader>fb", ":lua Snacks.picker.buffers()<cr>", { desc = "Buffers" })
vim.keymap.set("n", "<leader>ff", ":lua Snacks.picker.files()<cr>", { desc = "Find Files" })
vim.keymap.set("n", "<leader>fg", ":lua Snacks.picker.git_files()<cr>", { desc = "Find Git Files" })

View File

@@ -40,6 +40,9 @@ vim.lsp.enable('basedpyright', {
}
})
-- vim.lsp.config('gdscript', {})
-- vim.lsp.enable('gdscript')
require("lsp_signature").setup({
debug = false,