diff --git a/.config/nvim/after/ftplugin/gdscript.lua b/.config/nvim/after/ftplugin/gdscript.lua new file mode 100644 index 0000000..c69f5c3 --- /dev/null +++ b/.config/nvim/after/ftplugin/gdscript.lua @@ -0,0 +1,12 @@ +local port = os.getenv("GDScript_Port") or "6005" +local cmd = vim.lsp.rpc.connect("127.0.0.1", port) +local pipe = "/tmp/godot.pipe" + +vim.lsp.start({ + name = "Godot", + cmd = cmd, + root_dir = vim.fs.dirname(vim.fs.find({ "project.godot", ".git" }, { upward = true })[1]), + on_attach = function(client, bufnr) + vim.api.nvim_command('echo serverstart("' .. pipe .. '")') + end, +}) diff --git a/.config/nvim/lua/nvwynd/options.lua b/.config/nvim/lua/nvwynd/options.lua index 89fbcd1..1a97196 100644 --- a/.config/nvim/lua/nvwynd/options.lua +++ b/.config/nvim/lua/nvwynd/options.lua @@ -66,3 +66,20 @@ vim.diagnostic.config({ update_in_insert = true, virtual_text = true, }) + +-- neovide +if g.neovide then + o.scrolloff = 0 + o.sidescrolloff = 0 + + g.neovide_scale_factor = 0.9 + local change_scale_factor = function(delta) + g.neovide_scale_factor = g.neovide_scale_factor * delta + end + vim.keymap.set("n", "", function() + change_scale_factor(1.25) + end) + vim.keymap.set("n", "", function() + change_scale_factor(1 / 1.25) + end) +end diff --git a/.config/nvim/lua/nvwynd/plugins/lsp.lua b/.config/nvim/lua/nvwynd/plugins/lsp.lua index 0fa58de..ff90c73 100644 --- a/.config/nvim/lua/nvwynd/plugins/lsp.lua +++ b/.config/nvim/lua/nvwynd/plugins/lsp.lua @@ -9,9 +9,10 @@ return { local lspconfig = require("lspconfig") local capabilities = require("blink.cmp").get_lsp_capabilities() - lspconfig.svelte.setup({ - capabilities = capabilities, - }) + -- Svelte + -- lspconfig.svelte.setup({ + -- capabilities = capabilities, + -- }) -- Markdown lspconfig.marksman.setup({ @@ -58,6 +59,12 @@ return { }, }) + -- C + lspconfig.clangd.setup({ + capabilities = capabilities, + }) + + -- TOML lspconfig.taplo.setup({ capabilities = capabilities, }) @@ -88,16 +95,31 @@ return { }, }) + -- GDScript + -- lspconfig.gdscript.setup({ + -- capabilities = capabilities, + -- }) + -- Zig - lspconfig.zls.setup({ - capabilities = capabilities, - }) + -- lspconfig.zls.setup({ + -- capabilities = capabilities, + -- }) -- Nim lspconfig.nim_langserver.setup({ capabilities = capabilities, }) + -- Clojure + -- lspconfig.clojure_lsp.setup({ + -- capabilities = capabilities, + -- }) + + -- Gleam + lspconfig.gleam.setup({ + capabilities = capabilities, + }) + -- Bash lspconfig.bashls.setup({ capabilities = capabilities, diff --git a/.config/nvim/lua/nvwynd/plugins/treesitter.lua b/.config/nvim/lua/nvwynd/plugins/treesitter.lua index c63257a..4783946 100644 --- a/.config/nvim/lua/nvwynd/plugins/treesitter.lua +++ b/.config/nvim/lua/nvwynd/plugins/treesitter.lua @@ -47,8 +47,11 @@ return { "python", "zig", "nim", + "clojure", + "gleam", "bash", "hurl", + "gdscript", -- the not so cool stuff "c", diff --git a/.zshrc b/.zshrc index 5aec8d6..d832a42 100644 --- a/.zshrc +++ b/.zshrc @@ -81,12 +81,13 @@ antigen bundle zsh-users/zsh-autosuggestions antigen apply # aliases +alias ..='cd ..' alias python="python3" alias pip="pip3" alias ls='eza --icons' alias ll='eza -alh -F always --icons' alias grep='rg' -alias nv='nvim' +alias nvim='nvim' alias ff='fastfetch' alias tokei='tokei -s code'