diff --git a/lazyvim/.config/nvim/init.lua b/lazyvim/.config/nvim/init.lua index b0c22b6..27d6b7c 100644 --- a/lazyvim/.config/nvim/init.lua +++ b/lazyvim/.config/nvim/init.lua @@ -1,5 +1,3 @@ -- bootstrap lazy.nvim, LazyVim and your plugins require("config.lazy") -require("config.markdown") -require("config.treesitter") require("user.utils") diff --git a/lazyvim/.config/nvim/lua/config/lazy.lua b/lazyvim/.config/nvim/lua/config/lazy.lua index 617924b..5e78bd9 100644 --- a/lazyvim/.config/nvim/lua/config/lazy.lua +++ b/lazyvim/.config/nvim/lua/config/lazy.lua @@ -5,7 +5,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then if vim.v.shell_error ~= 0 then vim.api.nvim_echo({ { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, + { out, "WarningMsg" }, { "\nPress any key to exit..." }, }, true, {}) vim.fn.getchar() @@ -48,3 +48,115 @@ require("lazy").setup({ }, cache = true, }) + +require("render-markdown").setup({ + heading = { position = "inline" }, + quote = { repeat_linebreak = true }, + win_options = { + showbreak = { + default = "", + rendered = " ", + }, + breakindent = { + default = false, + rendered = true, + }, + breakindentopt = { + default = "", + rendered = "", + }, + }, + checkbox = { + unchecked = { icon = "✘ " }, + checked = { icon = "✔ " }, + }, + code = { + position = "right", + width = "block", + right_pad = 10, + }, + latex = { + enabled = false, + }, + link = { + custom = { + c = { + pattern = "%.[ch]$", + icon = " ", + }, + golang = { + pattern = "%.go$", + icon = " ", + }, + python = { + pattern = "%.py$", + icon = "󰌠 ", + }, + lua = { + pattern = "%.lua$", + icon = " ", + }, + -- shell = { + -- pattern = "%.[sh|zsh]$", + -- icon = " ", + -- }, + }, + }, +}) + +require("nvim-treesitter.configs").setup({ + -- A list of parser names, or "all" (the listed parsers MUST always be installed) + ensure_installed = { + "c", + "lua", + "bash", + "go", + "gomod", + "gowork", + "gosum", + "json", + "markdown", + "markdown_inline", + "python", + "zig", + }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + -- Automatically install missing parsers when entering buffer + -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + auto_install = true, + + -- List of parsers to ignore installing (or "all") + ignore_install = { "javascript" }, + + ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) + -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! + + highlight = { + enable = true, + + -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to + -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is + -- the name of the parser) + -- list of language that will be disabled + disable = {}, + -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files + disable = function(lang, buf) + local max_filesize = 100 * 1024 -- 100 KB + local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) + if ok and stats and stats.size > max_filesize then + return true + end + end, + + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + }, +}) + +require("mini.ai").setup() diff --git a/lazyvim/.config/nvim/lua/config/markdown.lua b/lazyvim/.config/nvim/lua/config/markdown.lua deleted file mode 100644 index 7bf1e27..0000000 --- a/lazyvim/.config/nvim/lua/config/markdown.lua +++ /dev/null @@ -1,54 +0,0 @@ -require("render-markdown").setup({ - heading = { position = "inline" }, - quote = { repeat_linebreak = true }, - win_options = { - showbreak = { - default = "", - rendered = " ", - }, - breakindent = { - default = false, - rendered = true, - }, - breakindentopt = { - default = "", - rendered = "", - }, - }, - checkbox = { - unchecked = { icon = "✘ " }, - checked = { icon = "✔ " }, - }, - code = { - position = "right", - width = "block", - right_pad = 10, - }, - latex = { - enabled = false, - }, - link = { - custom = { - c = { - pattern = "%.[ch]$", - icon = " ", - }, - golang = { - pattern = "%.go$", - icon = " ", - }, - python = { - pattern = "%.py$", - icon = "󰌠 ", - }, - lua = { - pattern = "%.lua$", - icon = " ", - }, - -- shell = { - -- pattern = "%.[sh|zsh]$", - -- icon = " ", - -- }, - }, - }, -}) diff --git a/lazyvim/.config/nvim/lua/config/treesitter.lua b/lazyvim/.config/nvim/lua/config/treesitter.lua deleted file mode 100644 index ec672d2..0000000 --- a/lazyvim/.config/nvim/lua/config/treesitter.lua +++ /dev/null @@ -1,54 +0,0 @@ -require("nvim-treesitter.configs").setup({ - -- A list of parser names, or "all" (the listed parsers MUST always be installed) - ensure_installed = { - "c", - "lua", - "bash", - "go", - "gomod", - "gowork", - "gosum", - "json", - "markdown", - "markdown_inline", - "python", - "zig", - }, - - -- Install parsers synchronously (only applied to `ensure_installed`) - sync_install = false, - - -- Automatically install missing parsers when entering buffer - -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally - auto_install = true, - - -- List of parsers to ignore installing (or "all") - ignore_install = { "javascript" }, - - ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) - -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! - - highlight = { - enable = true, - - -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to - -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is - -- the name of the parser) - -- list of language that will be disabled - disable = {}, - -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files - disable = function(lang, buf) - local max_filesize = 100 * 1024 -- 100 KB - local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) - if ok and stats and stats.size > max_filesize then - return true - end - end, - - -- Setting this to true will run `:h syntax` and tree-sitter at the same time. - -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). - -- Using this option may slow down your editor, and you may see some duplicate highlights. - -- Instead of true it can also be a list of languages - additional_vim_regex_highlighting = false, - }, -})