diff --git a/init.lua b/init.lua index ba0620a..dfdeaa1 100644 --- a/init.lua +++ b/init.lua @@ -43,11 +43,25 @@ require("lazy").setup({ { "L3MON4D3/LuaSnip" }, { "saadparwaiz1/cmp_luasnip" }, { "rafamadriz/friendly-snippets" }, + { "stevearc/conform.nvim", event = "BufReadPre", -- lazy-load when opening a file }, + { + 'windwp/nvim-autopairs', + event = "InsertEnter", + config = true, + opts = {} + }, + + { + "lukas-reineke/indent-blankline.nvim", + main = "ibl", + opts = {}, + }, + -- 🌳 TREESITTER { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" }, { "nvim-tree/nvim-tree.lua" }, @@ -60,9 +74,16 @@ require("lazy").setup({ -- 📊 STATUSLINE { "nvim-lualine/lualine.nvim" }, + { 'karb94/neoscroll.nvim' }, + -- 💻 TERMINAL { "akinsho/toggleterm.nvim", version = "*" }, + { + 'mawkler/modicator.nvim', + opts = {} + }, + { -- TODO: -- FIX: @@ -132,9 +153,9 @@ require("core.keymaps") require("plugins.colorscheme") require("plugins.cmp") require("plugins.lsp") +require("plugins.ibl") require("plugins.conform") - require("nvim-tree").setup({ sort = { sorter = "case_sensitive", diff --git a/lazy-lock.json b/lazy-lock.json index 6723332..c9aaecd 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -12,11 +12,15 @@ "copilot.vim": { "branch": "release", "commit": "da369d90cfd6c396b1d0ec259836a1c7222fb2ea" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" }, + "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, "lazy.nvim": { "branch": "main", "commit": "e6a8824858757ca9cd4f5ae1a72d845fa5c46a39" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "d7b5feb6e769e995f7fcf44d92f49f811c51d10c" }, "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, + "modicator.nvim": { "branch": "main", "commit": "0bc989b32a7ba3cab06cb79a433557384eb2a0be" }, + "neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" }, + "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" }, "nvim-cmp": { "branch": "main", "commit": "106c4bcc053a5da783bf4a9d907b6f22485c2ea0" }, "nvim-ide": { "branch": "main", "commit": "fb6d6fe65be188bc80559d377e72831a373085bd" }, "nvim-lspconfig": { "branch": "master", "commit": "2010fc6ec03e2da552b4886fceb2f7bc0fc2e9c0" }, @@ -24,7 +28,9 @@ "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "smear-cursor.nvim": { "branch": "main", "commit": "abfa5835920b1d76c0e24e1465a618ad914be90a" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "todo-comments.nvim": { "branch": "main", "commit": "411503d3bedeff88484de572f2509c248e499b38" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua index ccc42e8..f92de5d 100644 --- a/lua/core/keymaps.lua +++ b/lua/core/keymaps.lua @@ -11,6 +11,16 @@ keymap.set("n", "e", ":Lex 30", { desc = "Open file explorer" }) keymap.set("n", "w", ":w", { desc = "Save file" }) keymap.set("n", "q", ":q", { desc = "Quit" }) keymap.set("n", "h", ":nohlsearch", { desc = "Clear search highlight" }) +keymap.set('n', 'e', vim.diagnostic.open_float, { desc = "Show diagnostics at cursor" }) + +-- Diagnostic keymaps +vim.o.updatetime = 300 +vim.api.nvim_create_autocmd("CursorHold", { + callback = function() + vim.diagnostic.open_float(nil, { focus = false }) + end, +}) +keymap.set('n', 'K', vim.lsp.buf.hover, { desc = "Show hover info" }) -- Telescope keymaps keymap.set("n", "tf", "Telescope find_files", { desc = "Find Files" }) diff --git a/lua/plugins/ibl.lua b/lua/plugins/ibl.lua new file mode 100644 index 0000000..be401dd --- /dev/null +++ b/lua/plugins/ibl.lua @@ -0,0 +1 @@ +require("ibl").setup()