diff --git a/init.lua b/init.lua index 425b155..a92cd2f 100644 --- a/init.lua +++ b/init.lua @@ -17,3 +17,5 @@ end require "lazy_setup" require "polish" + + diff --git a/lazy-lock.json b/lazy-lock.json index 40be985..d2f1b92 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,17 +1,17 @@ { - "AstroNvim": { "branch": "main", "commit": "bfa02306c91c53f9b5782103f530ff729d6fd5b3" }, + "AstroNvim": { "branch": "main", "commit": "161b13bc968e66fa7135910b9d9b970452d94d5f" }, "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "SmoothCursor.nvim": { "branch": "main", "commit": "c082e1e943acec28d95aa05325097426e612047f" }, - "aerial.nvim": { "branch": "master", "commit": "7e2615991cf110f6688112abcb45cf338248d1f6" }, - "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "astrocommunity": { "branch": "main", "commit": "de5139ef600346f700b6950e8b90afc053710b00" }, - "astrocore": { "branch": "main", "commit": "e659ec1f23dd070fa9a68a78eab0675b7bf3e97d" }, - "astrolsp": { "branch": "main", "commit": "10ca6399694baca87982eafb0871b386fa33cf80" }, + "aerial.nvim": { "branch": "master", "commit": "d5ba0e3cfede432cec7e6ab28724c4a554ea0f09" }, + "alpha-nvim": { "branch": "main", "commit": "36e4baca9533ec87afa948fe20a0a1c4897a6a6e" }, + "astrocommunity": { "branch": "main", "commit": "ece293a5834edb92e5812a8582b47366dc3d207c" }, + "astrocore": { "branch": "main", "commit": "8a66da8b8d4dfd783703195a6448aad75837d947" }, + "astrolsp": { "branch": "main", "commit": "e8290b739fa08c181a2149be5d94db0a91a42cd0" }, "astrotheme": { "branch": "main", "commit": "41b7d8430a55fd771e41bd763af4c3fd1c2fc0b5" }, - "astroui": { "branch": "main", "commit": "a96ee08273f8050025c9e5b40776b0f2808313fa" }, + "astroui": { "branch": "main", "commit": "0bc327c4a69f2e2b1a45449d5064d8e27e650d66" }, "auto-save.nvim": { "branch": "main", "commit": "5fe9ab0c42f0457f2a973e814a6352b8eeb04730" }, - "better-escape.nvim": { "branch": "master", "commit": "92b3d7d06ac3405178def49853f81118a12ea051" }, + "better-escape.nvim": { "branch": "master", "commit": "f45b52f8f87792e8659526f23261ffe278a54be5" }, "catppuccin": { "branch": "main", "commit": "0b5df9c9e641b1212b21a0762ccad4434fd41322" }, "clangd_extensions.nvim": { "branch": "main", "commit": "a8500531c4ed3a207e744a374ea038744a0f93eb" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -20,67 +20,66 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "code_runner.nvim": { "branch": "main", "commit": "6c5bfe44a6c7523350cd706e6b3b8101166eed99" }, - "cyberdream.nvim": { "branch": "main", "commit": "fb68c9184afe80ed7b88a62f475b14b848a0645d" }, - "distant.nvim": { "branch": "v0.3", "commit": "823267cf3b77cf9a7ae28454926eabc18fec1ba0" }, + "cyberdream.nvim": { "branch": "main", "commit": "31f31f27dbc2517f72656ad4031f15d25a20dcf2" }, "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": "23f26dc09c6d61d574c92b4077598501dbe9aa06" }, + "grug-far.nvim": { "branch": "main", "commit": "d308a93ec74917dc827ab8870f5c08d0a112feda" }, "guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" }, "heirline.nvim": { "branch": "master", "commit": "0d797435e54645a5f98bad7ad6046aac1ef95c1e" }, "hlchunk.nvim": { "branch": "main", "commit": "d49b06762b51209b41577a84dc2925b4969e3954" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, "lsp_signature.nvim": { "branch": "master", "commit": "a38da0a61c172bb59e34befc12efe48359884793" }, "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, - "markview.nvim": { "branch": "main", "commit": "316cafc79490f8b79c288bbe6638838d6d68e227" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, + "markview.nvim": { "branch": "main", "commit": "7f4639a53b3e3aac3ad5deab99b21097264f07cc" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" }, + "mini.ai": { "branch": "main", "commit": "a9b992b13d22a8db8df6beac25afa59a10b5584d" }, "mini.bufremove": { "branch": "main", "commit": "e6044aa28e61d4dd9ec86194d6f81743eced0c1c" }, - "mini.icons": { "branch": "main", "commit": "352a25dce86c41ab9fe854dd37f60c36ea7048df" }, + "mini.icons": { "branch": "main", "commit": "fe63fe080e76d80713557e5f0c65bc15b14b152d" }, "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, "mini.move": { "branch": "main", "commit": "cde3747eec9bb3941296e6fa1d874e0da5a10256" }, "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" }, "multiple-cursors.nvim": { "branch": "main", "commit": "2f5e786c43aa9c0fc34b295cfcc9bfbacef8e926" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "neoconf.nvim": { "branch": "main", "commit": "7ce69e831556861f3bd32a5678f0176618df8621" }, + "neoconf.nvim": { "branch": "main", "commit": "bccd2b6b7e9c2551fe5881d46ee58966c22c99a0" }, "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, - "none-ls.nvim": { "branch": "main", "commit": "a0fe586525eac4247d40076cdb2f1c2f55912171" }, + "none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, - "nvim-highlight-colors": { "branch": "main", "commit": "a8f6952cb1ff7bde864a34c502f1a42c360a6662" }, - "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, + "nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" }, + "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spider": { "branch": "main", "commit": "508b3504a350fb9a93bd0b7c0d41b8b5fc732b5e" }, - "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, + "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-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "960cce4eba798748baff3892a62f2c2b210fb76b" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "97b8238fb6f1dd2b7d4168ee10457c277c9e6ee3" }, "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" }, - "smart-splits.nvim": { "branch": "master", "commit": "66fda3a601a5b4c679656f15eb6ddd613c8d3216" }, + "smart-splits.nvim": { "branch": "master", "commit": "1a2b268a7ec7aeef879cdd15973339010ec134f7" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "313b04e5b02d29ab9275c9295ff5e2b73921b0eb" }, - "transparent.nvim": { "branch": "main", "commit": "fd35a46f4b7c1b244249266bdcb2da3814f01724" }, - "treesj": { "branch": "main", "commit": "275f83c81a5a1f5ae23c1eac30c4ac28beebbca2" }, + "transparent.nvim": { "branch": "main", "commit": "2c78d94448b534c35ca1d88a3bae90b1cd1a3d4d" }, + "treesj": { "branch": "main", "commit": "0d81326b5afd36babe7dd480aabbb0b05f33e688" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, - "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "0a501a22b587cc98531fcb617bf8cda29cb2dc11" }, + "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "1420fb9e07b1d80cc6d87e7d90827fb2c1109cb3" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-visual-multi": { "branch": "master", "commit": "38b0e8d94a5499ccc17d6159763d32c79f53417b" }, "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } diff --git a/lua/community.lua b/lua/community.lua index b8ee4b8..cc2cbcd 100644 --- a/lua/community.lua +++ b/lua/community.lua @@ -7,7 +7,7 @@ return { "AstroNvim/astrocommunity", { import = "astrocommunity.pack.lua" }, { import = "astrocommunity.pack.json" }, - { import = "astrocommunity.pack.markdown" }, + -- { import = "astrocommunity.pack.markdown" }, { import = "astrocommunity.color.nvim-highlight-colors" }, { import = "astrocommunity.diagnostics.trouble-nvim" }, { import = "astrocommunity.neovim-lua-development.lazydev-nvim" }, diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua index ffc2eeb..d14d360 100644 --- a/lua/plugins/astrocore.lua +++ b/lua/plugins/astrocore.lua @@ -28,7 +28,7 @@ return { -- Configure auto saving autosave = { last = true, -- auto save last session - cwd = true, -- auto save session for each working directory + cwd = false, -- auto save session for each working directory }, -- Patterns to ignore when saving sessions ignore = { diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 3f58690..a8af0be 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -64,50 +64,50 @@ return { -- }, -- }, -- Better indent blankline - { - "shellRaining/hlchunk.nvim", - event = { "BufReadPre", "BufNewFile" }, - config = function(_, opts) - require("hlchunk").setup(require("astrocore").extend_tbl(opts, { - ignore = {}, - chunk = { - enable = true, - notify = false, - chars = { - -- horizontal_line = "━", - -- vertical_line = "┃", - -- left_top = "┏", - -- left_bottom = "┗", - -- right_arrow = "➤", - }, - style = "#06D001", - delay = 25, - }, - indent = { - enable = false, - use_treesitter = true, - chars = { - "│", - }, - }, - blank = { - enable = false, - chars = { - " ", - }, - style = { - { bg = "#434437" }, - { bg = "#2f4440" }, - { bg = "#433054" }, - { bg = "#284251" }, - }, - }, - line_num = { - enable = false, - }, - })) - end, - }, + -- { + -- "shellRaining/hlchunk.nvim", + -- event = { "BufReadPre", "BufNewFile" }, + -- config = function(_, opts) + -- require("hlchunk").setup(require("astrocore").extend_tbl(opts, { + -- ignore = {}, + -- chunk = { + -- enable = true, + -- notify = false, + -- chars = { + -- -- horizontal_line = "━", + -- -- vertical_line = "┃", + -- -- left_top = "┏", + -- -- left_bottom = "┗", + -- -- right_arrow = "➤", + -- }, + -- style = "#06D001", + -- delay = 25, + -- }, + -- indent = { + -- enable = false, + -- use_treesitter = true, + -- chars = { + -- "│", + -- }, + -- }, + -- blank = { + -- enable = false, + -- chars = { + -- " ", + -- }, + -- style = { + -- { bg = "#434437" }, + -- { bg = "#2f4440" }, + -- { bg = "#433054" }, + -- { bg = "#284251" }, + -- }, + -- }, + -- line_num = { + -- enable = false, + -- }, + -- })) + -- end, + -- }, -- AI code completion -- { -- "monkoose/neocodeium", @@ -249,17 +249,17 @@ return { }, }, -- Markdown preview support - { - "OXY2DEV/markview.nvim", - dependencies = { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - opts.ensure_installed = - require("astrocore").list_insert_unique(opts.ensure_installed, { "markdown", "markdown_inline" }) - end, - }, - }, - ft = { "markdown" }, - }, + -- { + -- "OXY2DEV/markview.nvim", + -- dependencies = { + -- { + -- "nvim-treesitter/nvim-treesitter", + -- opts = function(_, opts) + -- opts.ensure_installed = + -- require("astrocore").list_insert_unique(opts.ensure_installed, { "markdown", "markdown_inline" }) + -- end, + -- }, + -- }, + -- ft = { "markdown" }, + -- }, } diff --git a/lua/plugins/multiple-visual.lua b/lua/plugins/multiple-visual.lua index ab1b1e3..ed288ce 100644 --- a/lua/plugins/multiple-visual.lua +++ b/lua/plugins/multiple-visual.lua @@ -1,3 +1,5 @@ +if true then return {} end + return { "mg979/vim-visual-multi", event = "VeryLazy", diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua index d0af8ca..695bf7d 100644 --- a/lua/plugins/noice.lua +++ b/lua/plugins/noice.lua @@ -7,34 +7,34 @@ return { require("noice").setup { -- Configuration here, or leave empty to use defaults views = { - cmdline_popup = { - position = { - row = "50%", - col = "50%", - }, - size = { - width = 60, - height = "auto", - }, - }, - popupmenu = { - relative = "editor", - position = { - row = 8, - col = "50%", - }, - size = { - width = 60, - height = 10, - }, - border = { - style = "rounded", - padding = { 0, 1 }, - }, - win_options = { - winhighlight = { Normal = "Normal", FloatBorder = "DiagnosticInfo" }, - }, - }, + -- cmdline_popup = { + -- position = { + -- row = "50%", + -- col = "50%", + -- }, + -- size = { + -- width = 60, + -- height = "auto", + -- }, + -- }, + -- popupmenu = { + -- relative = "editor", + -- position = { + -- row = 8, + -- col = "50%", + -- }, + -- size = { + -- width = 60, + -- height = 10, + -- }, + -- border = { + -- style = "rounded", + -- padding = { 0, 1 }, + -- }, + -- win_options = { + -- winhighlight = { Normal = "Normal", FloatBorder = "DiagnosticInfo" }, + -- }, + -- }, }, messages = { enabled = false, -- disables the Noice messages UI @@ -57,7 +57,7 @@ return { }, }, presets = { - bottom_search = true, -- use a classic bottom cmdline for search + bottom_search = false, -- use a classic bottom cmdline for search command_palette = true, -- position the cmdline and popupmenu together long_message_to_split = false, -- long messages will be sent to a split inc_rename = false, -- enables an input dialog for inc-rename.nvim @@ -92,65 +92,6 @@ return { }, } end, - opts = function(_, opts) - local utils = require "astrocore" - return utils.extend_tbl(opts, { - lsp = { - progress = { - enabled = false, - }, - hover = { - enabled = false, -- disables Noice LSP hover - }, - signature = { - enabled = false, -- disables Noice LSP signature help - }, - message = { - enabled = false, - }, - }, - presets = { - bottom_search = true, -- use a classic bottom cmdline for search - command_palette = true, -- position the cmdline and popupmenu together - long_message_to_split = false, -- long messages will be sent to a split - inc_rename = false, -- enables an input dialog for inc-rename.nvim - lsp_doc_border = false, -- add a border to hover docs and signature help - }, - messages = { - enabled = false, -- disables the Noice messages UI - }, - notify = { - enabled = false, -- disables Noice notifications - }, - - routes = { - -- disable "written" notification - { - filter = { event = "msg_show", kind = "", find = "written" }, - opts = { skip = true }, - }, - -- disable paste/undo notification - { - filter = { event = "msg_show", find = "^%d+ more lines" }, - opts = { skip = true }, - }, - -- disable delete/undo notification - { - filter = { event = "msg_show", find = "^%d+ fewer lines" }, - opts = { skip = true }, - }, - -- disable yank notification - { - filter = { event = "msg_show", find = "^%d+ lines yanked$" }, - opts = { skip = true }, - }, - -- disable move notification - { - filter = { event = "msg_show", find = "^%d+ lines moved$" }, - }, - }, - }) - end, specs = { { "nvim-treesitter/nvim-treesitter", diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 9838091..b316746 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -20,13 +20,17 @@ return { opts = function(_, opts) -- Do this to prevent the warning opts.background_colour = "#000000" + opts.timeout = 2000 + opts.fps = 60 + opts.render = "compact" + opts.top_down = false end, }, -- Icons support { "echasnovski/mini.icons", opts = function(_, opts) - if vim.g.icons_enabled == false then opts.style = "ascii" end + if vim.g.icons_enabled == false then opts.style = "glyph" end end, lazy = true, specs = {