diff --git a/init.lua b/init.lua index 1bffc01..b992d67 100644 --- a/init.lua +++ b/init.lua @@ -15,6 +15,9 @@ vim.opt.cursorline = true vim.opt.ignorecase = true vim.opt.smartcase = true + +vim.g.maplocalleader = ',' + -- bootstrap lazy local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(lazypath) then diff --git a/lua/lsp-setup.lua b/lua/lsp-setup.lua index 17f36eb..a51330b 100644 --- a/lua/lsp-setup.lua +++ b/lua/lsp-setup.lua @@ -40,6 +40,9 @@ lspconfig.nixd.setup({ }) lspconfig.csharp_ls.setup({ + cmd_env = { + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1, + }, root_dir = function() return vim.fs.root(0, ".git") end, diff --git a/lua/plugins.lua b/lua/plugins.lua index 14d5889..b9d611e 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -20,6 +20,8 @@ local function is_work() return vim.fn.hostname() == "SCHREWE" end +local is_termux = os.getenv('TERMUX_VERSION') ~= nil + return { { "zbirenbaum/copilot.lua", @@ -29,10 +31,13 @@ return { }, { "zbirenbaum/copilot-cmp", + enabled = is_work(), opts = {}, + enabled = is_work() }, { "yetone/avante.nvim", + enabled = is_work(), event = "VeryLazy", lazy = false, version = false, @@ -42,6 +47,7 @@ return { auto_suggestions = false, -- Experimental stage }, }, + enabled = is_work(), dependencies = { "stevearc/dressing.nvim", "nvim-lua/plenary.nvim", @@ -198,7 +204,10 @@ return { "nvim-treesitter/nvim-treesitter", config = function() require("nvim-treesitter.configs").setup({ - ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "rust", "cpp" }, + ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "rust", "cpp", "fennel" }, + highlight = { + enable = true + } }) end, build = function() @@ -223,6 +232,7 @@ return { { "", "Neotree", desc = "View files", mode = { "n", "i", "x" } }, }, lazy = false, + enabled = not is_termux }, "direnv/direnv.vim", { diff --git a/lua/plugins/editing.lua b/lua/plugins/editing.lua index 8965738..a62f5b5 100644 --- a/lua/plugins/editing.lua +++ b/lua/plugins/editing.lua @@ -4,6 +4,12 @@ return { event = "InsertEnter", opts = {}, }, + { + "olical/conjure", + config = function() + -- vim.g["conjure#filetype#fennel"] = "conjure.client.fennel.stdio" + end + }, { "windwp/nvim-ts-autotag", opts = {},