diff --git a/init.lua b/init.lua index a92cd2f..6d90d67 100644 --- a/init.lua +++ b/init.lua @@ -13,6 +13,7 @@ if not pcall(require, "lazy") then vim.api.nvim_echo({ { ("Unable to load lazy from: %s\n"):format(lazypath), "ErrorMsg" }, { "Press any key to exit...", "MoreMs" } }, true, {}) vim.fn.getchar() vim.cmd.quit() + end require "lazy_setup" diff --git a/lazy-lock.json b/lazy-lock.json index a3db6a8..2f58476 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,8 +3,8 @@ "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "aerial.nvim": { "branch": "master", "commit": "d5ba0e3cfede432cec7e6ab28724c4a554ea0f09" }, - "alpha-nvim": { "branch": "main", "commit": "36e4baca9533ec87afa948fe20a0a1c4897a6a6e" }, - "astrocommunity": { "branch": "main", "commit": "bb8089b72bbb11ad850902ce58a9f1fc64277563" }, + "alpha-nvim": { "branch": "main", "commit": "355fbb81a59637a8963cf5847074f8c44dbef11f" }, + "astrocommunity": { "branch": "main", "commit": "f39a93eae6d632858acd38f5f91c5598083a05cf" }, "astrocore": { "branch": "main", "commit": "8a66da8b8d4dfd783703195a6448aad75837d947" }, "astrolsp": { "branch": "main", "commit": "e8290b739fa08c181a2149be5d94db0a91a42cd0" }, "astrotheme": { "branch": "main", "commit": "41b7d8430a55fd771e41bd763af4c3fd1c2fc0b5" }, @@ -19,13 +19,13 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "code_runner.nvim": { "branch": "main", "commit": "6c5bfe44a6c7523350cd706e6b3b8101166eed99" }, - "cyberdream.nvim": { "branch": "main", "commit": "9454c831c269dbdf2dc63be4afeb09697a442c52" }, + "cyberdream.nvim": { "branch": "main", "commit": "fadfa8ee6fa4c566958d450a552ecc092e60d8ae" }, "dressing.nvim": { "branch": "master", "commit": "71349f24c6e07b39f33600985843c289ca735308" }, "duplicate.nvim": { "branch": "main", "commit": "ab057af7872c44e6fbd48df9b03983c8e67c50a7" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, - "grug-far.nvim": { "branch": "main", "commit": "536b23dcf3165a622654544e5f9f395584e73b57" }, + "grug-far.nvim": { "branch": "main", "commit": "5aae8b67be44682d469e71ec9e285793111f10a9" }, "guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" }, "heirline.nvim": { "branch": "master", "commit": "0d797435e54645a5f98bad7ad6046aac1ef95c1e" }, "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, @@ -43,10 +43,10 @@ "mini.icons": { "branch": "main", "commit": "fe63fe080e76d80713557e5f0c65bc15b14b152d" }, "mini.indentscope": { "branch": "main", "commit": "d2e7b5f0260789c325f92ab3421ff9884ea01842" }, "mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" }, - "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" }, + "mini.surround": { "branch": "main", "commit": "d8913ed23be0a1a4585ae34414821cc343a46174" }, "multiple-cursors.nvim": { "branch": "main", "commit": "2f5e786c43aa9c0fc34b295cfcc9bfbacef8e926" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "neoconf.nvim": { "branch": "main", "commit": "bccd2b6b7e9c2551fe5881d46ee58966c22c99a0" }, + "neoconf.nvim": { "branch": "main", "commit": "a6e09d22fda3ee5ce472e135a0df9b96d26706a7" }, "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, @@ -55,14 +55,14 @@ "nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" }, - "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, + "nvim-lspconfig": { "branch": "master", "commit": "037ea0901ce9a28cfcaa36302618f06d2e164fbf" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spider": { "branch": "main", "commit": "508b3504a350fb9a93bd0b7c0d41b8b5fc732b5e" }, - "nvim-treesitter": { "branch": "master", "commit": "176e4464736c1feca190d77f481ed5972b513516" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ca93cb2c34b67ab22d01976fc90bc95627a3317f" }, - "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, + "nvim-spider": { "branch": "main", "commit": "7641ce03636633b986493fc6f52d5051cb1375ce" }, + "nvim-treesitter": { "branch": "master", "commit": "bfb50de9cb0673a3bff620d881f690fb7e0d1328" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ced6375723b20616282f9f6a1018a63ae19b106a" }, + "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "375c2d86cee6674afd75b4f727ce3a80065552f7" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, diff --git a/lua/core/autocmds.lua b/lua/core/autocmds.lua index b5cb277..4b0b1cd 100644 --- a/lua/core/autocmds.lua +++ b/lua/core/autocmds.lua @@ -4,6 +4,9 @@ vim.api.nvim_create_augroup("auto_wrap", { clear = true }) vim.api.nvim_create_augroup("disable_suspend_with_c_z", { clear = true }) vim.api.nvim_create_augroup("clear_last_search", { clear = true }) +-- NOTE: CursorLineNr setting +vim.api.nvim_set_hl(0, "CursorLineNr", { fg = "#FFD700", bg = "none", bold = true }) + vim.api.nvim_create_autocmd("BufEnter", { desc = "Disable auto insert comment newline", group = "disable_comment_newline", diff --git a/lua/lazy_setup.lua b/lua/lazy_setup.lua index cca2306..db9d8bd 100644 --- a/lua/lazy_setup.lua +++ b/lua/lazy_setup.lua @@ -1,4 +1,5 @@ require("lazy").setup({ + { "AstroNvim/AstroNvim", version = "^4", -- Remove version tracking to elect for nighly AstroNvim @@ -15,7 +16,18 @@ require("lazy").setup({ } --[[@as LazySpec]], { -- Configure any other `lazy.nvim` configuration options here install = { colorscheme = { "astrodark", "habamax" } }, - ui = { backdrop = 100 }, + + ui = { + backdrop = 100, + border = "single", + size = { width = 0.8, height = 0.8 }, + }, + + checker = { + enabled = true, + notify = false, + }, + performance = { rtp = { -- disable some rtp plugins, add more to your liking diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua index 89d09fa..bd5a64f 100644 --- a/lua/plugins/astrocore.lua +++ b/lua/plugins/astrocore.lua @@ -11,15 +11,15 @@ return { -- Configure core features of AstroNvim features = { large_buf = { size = 1024 * 500, lines = 10000 }, -- set global limits for large files for disabling features like treesitter - autopairs = true, -- enable autopairs at start + autopairs = false, -- enable autopairs at start cmp = true, -- enable completion at start diagnostics_mode = 3, -- diagnostic mode on start (0 = off, 1 = no signs/virtual text, 2 = no virtual text, 3 = on) - highlighturl = true, -- highlight URLs at start - notifications = false, -- enable notifications at start + highlighturl = false, -- highlight URLs at start + notifications = true, -- enable notifications at start }, -- Diagnostics configuration (for vim.diagnostics.config({...})) when diagnostics are on diagnostics = { - virtual_text = true, + -- virtual_text = true, underline = true, update_in_insert = false, }, diff --git a/lua/plugins/configs/ui/heirline.lua b/lua/plugins/configs/ui/heirline.lua index 018a29a..211e994 100644 --- a/lua/plugins/configs/ui/heirline.lua +++ b/lua/plugins/configs/ui/heirline.lua @@ -37,14 +37,14 @@ M.statusline = { }, }, -- Add a icon to represent diagnostic and git git diff - status.component.builder { - provider = function() return get_icon "Diagnostic" .. "/" .. get_icon "Github" end, - hl = { fg = "black" }, - surround = { - separator = { " ", "" }, - color = "#81ab9e", - }, - }, + -- status.component.builder { + -- provider = function() return get_icon "Diagnostic" .. "/" .. get_icon "Github" end, + -- hl = { fg = "black" }, + -- surround = { + -- separator = { " ", "" }, + -- color = "#81ab9e", + -- }, + -- }, status.component.diagnostics { surround = { separator = "none", diff --git a/lua/plugins/cyber-dream.lua b/lua/plugins/cyber-dream.lua index 1d41819..8e539a8 100644 --- a/lua/plugins/cyber-dream.lua +++ b/lua/plugins/cyber-dream.lua @@ -4,8 +4,7 @@ return { transparent = true, italic_comments = true, hide_fillchars = true, - borderless_telescope = true, - terminal_colors = true, - + borderless_telescope = false, + terminal_colors = false, }, } diff --git a/lua/plugins/indent-scope.lua b/lua/plugins/indent-scope.lua index f134693..726b12f 100644 --- a/lua/plugins/indent-scope.lua +++ b/lua/plugins/indent-scope.lua @@ -19,8 +19,7 @@ local ignore_buftypes = { "quickfix", "terminal", } -local char = "||" - +local char = "󰸊" return { "echasnovski/mini.indentscope", @@ -32,7 +31,11 @@ return { } end, dependencies = { - { "lukas-reineke/indent-blankline.nvim", optional = true, opts = { scope = { enabled = false } } }, + { + "lukas-reineke/indent-blankline.nvim", + optional = true, + opts = { scope = { enabled = false } }, + }, { "AstroNvim/astrocore", opts = { diff --git a/lua/plugins/mason-setup.lua b/lua/plugins/mason-setup.lua new file mode 100644 index 0000000..ba0a838 --- /dev/null +++ b/lua/plugins/mason-setup.lua @@ -0,0 +1,40 @@ +return { + "williamboman/mason.nvim", + opts = function() + require("mason").setup { + ui = { + ---@since 1.0.0 + -- Whether to automatically check for new versions when opening the :Mason window. + check_outdated_packages_on_open = true, + + ---@since 1.0.0 + -- The border to use for the UI window. Accepts same border values as |nvim_open_win()|. + border = "single", + + ---@since 1.0.0 + -- Width of the window. Accepts: + -- - Integer greater than 1 for fixed width. + -- - Float in the range of 0-1 for a percentage of screen width. + width = 0.8, + + ---@since 1.0.0 + -- Height of the window. Accepts: + -- - Integer greater than 1 for fixed height. + -- - Float in the range of 0-1 for a percentage of screen height. + height = 0.9, + + icons = { + ---@since 1.0.0 + -- The list icon to use for installed packages. + package_installed = "  ", + ---@since 1.0.0 + -- The list icon to use for packages that are installing, or queued for installation. + package_pending = "  ", + ---@since 1.0.0 + -- The list icon to use for packages that are not installed. + package_uninstalled = "  ", + }, + }, + } + end, +}