diff --git a/lazy-lock.json b/lazy-lock.json index 3edcf8b..7227e46 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,18 +5,19 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" }, "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, - "gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" }, + "gitsigns.nvim": { "branch": "main", "commit": "31217271a7314c343606acb4072a94a039a19fb5" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "fb179adb7161b53ec998b1139002473434586c3f" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "ae609525ddf01c153c39305730b1791800ffe4fe" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, "nvim": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" }, - "nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" }, + "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, - "nvim-lspconfig": { "branch": "master", "commit": "ff9c0af8f9b2097fdd2695058db7e04c193908aa" }, - "nvim-treesitter": { "branch": "main", "commit": "f8bbc3177d929dc86e272c41cc15219f0a7aa1ac" }, - "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" }, + "nvim-lspconfig": { "branch": "master", "commit": "d1597791f8196519439b3a036b59b09023981e1d" }, + "nvim-tree.lua": { "branch": "master", "commit": "a0db8bf7d6488b1dcd9cb5b0dfd6684a1e14f769" }, + "nvim-treesitter": { "branch": "main", "commit": "9f2dad22ef8bb14fd1e0a3aa8859cdc88170668b" }, + "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 252cf68..5c5538f 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -11,7 +11,6 @@ return { ensure_installed = { "go", "gomod", - "gosum", "gowork", "typescript", "tsx", @@ -22,6 +21,7 @@ return { "markdown", "yaml", "bash", + "c_sharp", }, }) end, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 97d47cb..c8c7ac5 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -10,7 +10,7 @@ return { dependencies = { "williamboman/mason.nvim" }, opts = { -- installs these via Mason (so you don't have to) - ensure_installed = { "gopls", "ts_ls", "lua_ls", "clangd", "rust_analyzer" }, + ensure_installed = { "gopls", "ts_ls", "lua_ls", "clangd", "rust_analyzer", "omnisharp" }, -- optional: automatically call vim.lsp.enable() for installed servers automatic_enable = true, @@ -162,6 +162,7 @@ return { c = { "clang-format" }, cpp = { "clang-format" }, rust = { "rustfmt" }, + cs = { "csharpier" }, }, }) @@ -170,4 +171,5 @@ return { end, { desc = "Format" }) end, }, + } diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua new file mode 100644 index 0000000..79fa52f --- /dev/null +++ b/lua/plugins/nvim-tree.lua @@ -0,0 +1,43 @@ +-- ~/.config/nvim/lua/plugins/nvim-tree.lua +return { + { + "nvim-tree/nvim-tree.lua", + version = "*", -- use latest stable tag + dependencies = { + -- optional, but recommended for file icons + "nvim-tree/nvim-web-devicons", + }, + cmd = { "NvimTreeToggle", "NvimTreeFocus", "NvimTreeFindFile", "NvimTreeOpen" }, + keys = { + { "e", "NvimTreeToggle", desc = "Explorer (toggle)" }, + { "E", "NvimTreeFindFile", desc = "Explorer (reveal file)" }, + }, + init = function() + -- recommended: disable netrw to avoid conflicts + vim.g.loaded_netrw = 1 + vim.g.loaded_netrwPlugin = 1 + + -- you already set this elsewhere, but it's fine to keep it here too + vim.opt.termguicolors = true + end, + opts = { + sort = { sorter = "case_sensitive" }, + view = { width = 32 }, + renderer = { group_empty = true }, + filters = { dotfiles = false }, + + -- Quality-of-life + update_focused_file = { + enable = true, + update_root = false, + }, + git = { enable = true }, + diagnostics = { enable = true }, + + -- Close tree when opening a file (optional: set to false if you prefer it pinned) + actions = { + open_file = { quit_on_open = false }, + }, + }, + }, +} diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index b1b1cd6..a69b0f2 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,7 +1,6 @@ return { { "nvim-tree/nvim-web-devicons", lazy = true }, - -- Theme: pick ONE. TokyoNight is a safe default. { "catppuccin/nvim", priority = 1000, @@ -28,5 +27,5 @@ return { options = { theme = "auto", globalstatus = true }, }) end, - }, + } }