This commit is contained in:
Christian Nieves
2023-11-17 10:12:53 -06:00
parent ab276d95e5
commit 7d6a1f823d
9 changed files with 50 additions and 3 deletions

View File

@ -71,6 +71,7 @@
"oxocarbon.nvim": { "branch": "main", "commit": "b47c0ecab3a4270815afb3b05e03423b04cca8f2" },
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
"quickgd.nvim": { "branch": "main", "commit": "470efa730ebaf2e95653b13c22b93d8d60d31e79" },
"refactoring.nvim": { "branch": "master", "commit": "5831194debd23920a32abd9fefd5dddba44e34fc" },
"registers.nvim": { "branch": "main", "commit": "7a16c6e6fe96f3c9c8bb55b95047d745dd34ca4d" },
"rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
@ -85,6 +86,7 @@
"vim-better-whitespace": { "branch": "master", "commit": "1b22dc57a2751c7afbc6025a7da39b7c22db635d" },
"vim-conjoin": { "branch": "master", "commit": "2ea3b8ed994d12bbf255825d973d865621c64860" },
"vim-floaterm": { "branch": "master", "commit": "6e81602e9d7ff7dc1c96c66fedc38fca1262d57c" },
"vim-godot": { "branch": "master", "commit": "d748a46be5195256f6b2c767ef32de87b05ae8f7" },
"vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" },
"vim-imp": { "branch": "main", "commit": "bf03e3754602bcd385e96a6f7c2b89740d501f57" },
"vim-maktaba": { "branch": "master", "commit": "fe95bb10f6bb250943a44632107f6a3d76ce5f28" },

View File

@ -4,3 +4,4 @@ for/!
tooling/!
createApkDescriptor
setInstance
collsion_body

View File

@ -46,3 +46,8 @@
cmd = nvim -d -c \"wincmd l\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
[diff]
tool = icdiff
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true

View File

@ -0,0 +1,4 @@
set autoindent
set noexpandtab
set tabstop=4
set shiftwidth=4

View File

@ -3,8 +3,9 @@ return {
lazy = false,
config = function()
local ft = require("Comment.ft")
ft.gd = "#%s"
ft.gdscript = "#%s"
ft.gd = "# %s"
ft.gdscript = "# %s"
ft.gsl = "// %s"
require("Comment").setup({
---Add a space b/w comment and the line

View File

@ -0,0 +1,23 @@
local use_google = require("utils").use_google
return {
{
"habamax/vim-godot",
cond = not use_google(),
},
{
"QuickGD/quickgd.nvim",
ft = { "gdshader", "gdshaderinc" },
cmd = { "GodotRun", "GodotRunLast", "GodotStart" },
cond = not use_google(),
-- Use opts if passing in settings else use config
init = function()
vim.filetype.add({
extension = {
gdshaderinc = "gdshaderinc",
},
})
end,
config = true,
opts = {}, -- remove config and use this if changing settings.
},
}

View File

@ -25,6 +25,15 @@ return {
{
"hinell/lsp-timeout.nvim",
dependencies = { "neovim/nvim-lspconfig" },
config = function()
vim.g.lspTimeoutConfig = {
filetypes = {
ignore = { -- filetypes to ignore; empty by default
"gdscript",
}, -- for these filetypes
},
}
end,
},
{
"neovim/nvim-lspconfig",
@ -77,6 +86,8 @@ return {
-- Godot
lspconfig.gdscript.setup({})
vim.cmd([[autocmd FileType gdscript setlocal commentstring=#\ %s]])
vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4]])
-- Golang
require("go").setup({

View File

@ -54,7 +54,7 @@ bindkey '^X^e' edit-command-line
bindkey '\e.' insert-last-word
bindkey '\ef' forward-word
bindkey '\eb' backward-word
bindkey '\ed' forward-kill-word
bindkey '\ed' kill-word
bindkey '^[^?' backward-kill-word
bindkey "^[[A" history-beginning-search-backward
bindkey "^[[B" history-beginning-search-forward