diff --git a/configs/nvim/init.lua b/configs/nvim/init.lua index 8e1f190..c61c975 100644 --- a/configs/nvim/init.lua +++ b/configs/nvim/init.lua @@ -1,11 +1,11 @@ require("max.core.bootstrap") +require("max.core.options") + require("max.core.plugins") require("max.core.autocommands") require("max.core.keymappings") -require("max.core.options") - vim.cmd("colorscheme catppuccin") diff --git a/configs/nvim/lazy-lock.json b/configs/nvim/lazy-lock.json index cb8bd36..acc0430 100644 --- a/configs/nvim/lazy-lock.json +++ b/configs/nvim/lazy-lock.json @@ -26,9 +26,9 @@ "lspsaga.nvim": { "branch": "main", "commit": "a626bdeedf2e601f8dcd9274b2d035dd4ee21165" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "93e58e100f37ef4fb0f897deeed20599dae9d128" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "3f9c0ea157e88b08e2d11ec65002eeb6e421f0da" }, "mason.nvim": { "branch": "main", "commit": "01dfdfd36be77cb1195b60d580315bf4e2d8e62c" }, - "mini.nvim": { "branch": "main", "commit": "4b565c1499332b226fe31fe0dac363a95d6f5ddc" }, + "mini.nvim": { "branch": "main", "commit": "fb5b7db81ad212f873086c1538ecef0ad091739f" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "74040b34278910d9b467fd914862e2a9a1ebacaa" }, "neotest": { "branch": "master", "commit": "b06b0ccbddc61acfe781689da969d2e0117b3dfe" }, "neotest-jest": { "branch": "main", "commit": "821bb227e31259307db30c88671a1c3724f78637" }, @@ -47,8 +47,8 @@ "nvim-recorder": { "branch": "main", "commit": "89c1fb1139fac0a4b42faf54beaf363be104550b" }, "nvim-scrollbar": { "branch": "main", "commit": "75210c554e935740448cfb532d8a671ae544bb1b" }, "nvim-toggleterm.lua": { "branch": "main", "commit": "1f47ea9cda973af3f1742a71841f3914f5b1469f" }, - "nvim-treesitter": { "branch": "master", "commit": "ad8798795c71a00e796e1919c905a6bf815e9359" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "2f3583001e2bf793480f38cf0d055571787b0259" }, + "nvim-treesitter": { "branch": "master", "commit": "8d2f9903f11542c3363353a65a8e08adfcca9d29" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "4b30081d2736e09f90c890a8a7adfe4df36f5b36" }, "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" }, "nvim-ufo": { "branch": "main", "commit": "b70c9ef0f8e2673a11387a39185ff249e00df19f" }, diff --git a/configs/nvim/lua/max/configs/telescope.lua b/configs/nvim/lua/max/configs/telescope.lua index e6dd28d..56d3713 100644 --- a/configs/nvim/lua/max/configs/telescope.lua +++ b/configs/nvim/lua/max/configs/telescope.lua @@ -67,4 +67,4 @@ local default = { telescope.setup(default) telescope.load_extension("notify") -telescope.load_extension("persisted") -- To load the telescope extension +-- telescope.load_extension("persisted") -- To load the telescope extension diff --git a/configs/nvim/lua/max/core/autocommands.lua b/configs/nvim/lua/max/core/autocommands.lua index a170508..dea41d2 100644 --- a/configs/nvim/lua/max/core/autocommands.lua +++ b/configs/nvim/lua/max/core/autocommands.lua @@ -22,7 +22,6 @@ autocmd({ "BufWinLeave" }, { pattern = "*.*", callback = function() vim.cmd.mkview() - vim.cmd("SessionSave") end, group = save_fold, }) @@ -42,7 +41,6 @@ autocmd({ "BufWinEnter", "BufAdd" }, { if vim.bo[opts.buf].filetype == 'NvimTree' or vim.bo[opts.buf].filetype == "neo-tree" then vim.opt.statuscolumn = '' else - -- vim.o.statuscolumn = '%=%r%s%#FoldColumn#%{foldlevel(v:lnum) > foldlevel(v:lnum - 1) ? (foldclosed(v:lnum) == -1 ? "" : "") : " " } %*' vim.opt.statuscolumn = [[%!v:lua.Status.column()]] end end, @@ -65,5 +63,3 @@ autocmd("BufReadPost", { end end, }) - - diff --git a/configs/nvim/lua/max/core/plugins.lua b/configs/nvim/lua/max/core/plugins.lua index dd3e12b..a21c6a5 100644 --- a/configs/nvim/lua/max/core/plugins.lua +++ b/configs/nvim/lua/max/core/plugins.lua @@ -31,6 +31,16 @@ local plugins = { version = false, event = "VeryLazy", config = function() + -- require("mini.sessions").setup({ + -- autoread = true, + -- directory = "session", + -- file = "", + -- verbose = { read = true, write = true, delete = true }, + -- }) + + require("mini.comment").setup({ + }) + require("mini.pairs").setup({ }) @@ -143,13 +153,6 @@ local plugins = { require("max.configs.dashboard") end, }, -- startup screen - { - "numToStr/Comment.nvim", - event = "BufReadPost", - config = function() - require("Comment").setup() - end, - }, --------------------- -- Code Navigation -- --------------------- @@ -314,7 +317,7 @@ local plugins = { require("max.configs.session") end, }, - -- Dap Debugger -- Have not yet been able to set this up + --Dap Debugger -- Have not yet been able to set this up { "mfussenegger/nvim-dap", dependencies = { diff --git a/configs/nvim/lua/max/theme/catpuccin.lua b/configs/nvim/lua/max/theme/catpuccin.lua index 82a9e39..7d3d145 100644 --- a/configs/nvim/lua/max/theme/catpuccin.lua +++ b/configs/nvim/lua/max/theme/catpuccin.lua @@ -5,6 +5,7 @@ return { opts = { -- transparent_background = true, flavour = "mocha", -- latte, frappe, macchiato, mocha + term_colors = true, compile = { enabled = true, path = vim.fn.stdpath("cache") .. "/catppuccin", @@ -21,7 +22,7 @@ return { lsp_saga = true, notify = true, neotree = { - enabled = true, + enabled = false, show_root = false, }, dap = {