diff options
| -rw-r--r-- | .config/nvim/init.lua | 12 | ||||
| -rw-r--r-- | .config/nvim/lsp/lua_ls.lua (renamed from .config/nvim_pack/lsp/lua_ls.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim/lsp/pyright.lua (renamed from .config/nvim_pack/lsp/pyright.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim/lua/configs/basic.lua | 1 | ||||
| -rw-r--r-- | .config/nvim/lua/configs/lsp.lua (renamed from .config/nvim_pack/lua/configs/lsp.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim/lua/configs/vim-plug.lua (renamed from .config/nvim_pack/lua/configs/vim-plug.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/marks.lua | 18 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/mason.lua (renamed from .config/nvim_pack/lua/plugins/mason.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/render-markdown.lua | 33 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/rustaceanvim.lua (renamed from .config/nvim_pack/lua/plugins/rustaceanvim.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim/nvim-pack-lock.json (renamed from .config/nvim_pack/nvim-pack-lock.json) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/LICENSE (renamed from .config/nvim/LICENSE) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/README.md (renamed from .config/nvim/README.md) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/ftplugin/c.lua (renamed from .config/nvim_pack/ftplugin/c.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/ftplugin/cpp.lua (renamed from .config/nvim/ftplugin/cpp.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/ftplugin/html.lua (renamed from .config/nvim/ftplugin/html.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/ftplugin/htmldjango.lua (renamed from .config/nvim/ftplugin/htmldjango.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/ftplugin/json.lua (renamed from .config/nvim_pack/ftplugin/json.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/ftplugin/lua.lua (renamed from .config/nvim_pack/ftplugin/lua.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/ftplugin/make.lua (renamed from .config/nvim_pack/ftplugin/make.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/ftplugin/python.lua (renamed from .config/nvim_pack/ftplugin/python.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/ftplugin/rust.lua (renamed from .config/nvim_pack/ftplugin/rust.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/ftplugin/sh.lua (renamed from .config/nvim_pack/ftplugin/sh.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/ftplugin/toml.lua (renamed from .config/nvim/ftplugin/toml.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/ftplugin/xml.lua (renamed from .config/nvim_pack/ftplugin/xml.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/init.lua | 4 | ||||
| -rw-r--r-- | .config/nvim_old/lazy-lock.json (renamed from .config/nvim/lazy-lock.json) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/lua/configs/basic.lua (renamed from .config/nvim_pack/lua/configs/basic.lua) | 1 | ||||
| -rw-r--r-- | .config/nvim_old/lua/configs/filetype.lua (renamed from .config/nvim/lua/configs/filetype.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/lua/configs/lazyvim.lua (renamed from .config/nvim/lua/configs/lazyvim.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/lua/plugins/completions.lua (renamed from .config/nvim/lua/plugins/completions.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/lua/plugins/lsp.lua (renamed from .config/nvim/lua/plugins/lsp.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/lua/plugins/marks.lua | 9 | ||||
| -rw-r--r-- | .config/nvim_old/lua/plugins/none-ls.lua (renamed from .config/nvim/lua/plugins/none-ls.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/lua/plugins/nvim-dap.lua (renamed from .config/nvim/lua/plugins/nvim-dap.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/lua/plugins/render-markdown.lua | 25 | ||||
| -rw-r--r-- | .config/nvim_old/lua/plugins/rust_analyzer.lua (renamed from .config/nvim/lua/plugins/rust_analyzer.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/lua/plugins/telescope.lua (renamed from .config/nvim/lua/plugins/telescope.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_old/lua/plugins/treesitter.lua (renamed from .config/nvim/lua/plugins/treesitter.lua) | 0 | ||||
| -rw-r--r-- | .config/nvim_pack/init.lua | 10 | ||||
| -rw-r--r-- | .config/nvim_pack/lsp/bashls.lua | 0 | ||||
| -rw-r--r-- | .config/nvim_pack/lsp/clangd.lua | 0 | ||||
| -rw-r--r-- | .config/nvim_pack/lsp/lemminx.lua | 0 | ||||
| -rw-r--r-- | .config/nvim_pack/lsp/marksman.lua | 0 | ||||
| -rw-r--r-- | .config/nvim_pack/lua/plugins/marks.lua | 11 | ||||
| -rw-r--r-- | .config/nvim_pack/lua/plugins/render-markdown.lua | 8 |
46 files changed, 66 insertions, 66 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 90379f8..bfc4b5b 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,4 +1,10 @@ ---- General configs -- +-- General configs -- require("configs.basic") -require("configs.filetype") -require("configs.lazyvim") +require("configs.vim-plug") +require("configs.lsp") + +-- Install plugins with native vim.pack -- +require("plugins.mason") +require("plugins.marks") +require("plugins.render-markdown") +require("plugins.rustaceanvim") diff --git a/.config/nvim_pack/lsp/lua_ls.lua b/.config/nvim/lsp/lua_ls.lua index c0a6d56..c0a6d56 100644 --- a/.config/nvim_pack/lsp/lua_ls.lua +++ b/.config/nvim/lsp/lua_ls.lua diff --git a/.config/nvim_pack/lsp/pyright.lua b/.config/nvim/lsp/pyright.lua index aece9a7..aece9a7 100644 --- a/.config/nvim_pack/lsp/pyright.lua +++ b/.config/nvim/lsp/pyright.lua diff --git a/.config/nvim/lua/configs/basic.lua b/.config/nvim/lua/configs/basic.lua index f4ccce1..b39412c 100644 --- a/.config/nvim/lua/configs/basic.lua +++ b/.config/nvim/lua/configs/basic.lua @@ -61,7 +61,6 @@ vim.keymap.set('n', '<A-k>', '<cmd>wincmd k<CR>', { desc = 'Move cursor to windo vim.keymap.set('n', '<A-j>', '<cmd>wincmd j<CR>', { desc = 'Move cursor to window below' }) vim.keymap.set('n', '<A-h>', '<cmd>wincmd h<CR>', { desc = 'Move cursor to window left' }) vim.keymap.set('n', '<A-l>', '<cmd>wincmd l<CR>', { desc = 'Move cursor to window right' }) --------------------------------------------- ----------------- -- Diagnostics -- diff --git a/.config/nvim_pack/lua/configs/lsp.lua b/.config/nvim/lua/configs/lsp.lua index 7acbeba..7acbeba 100644 --- a/.config/nvim_pack/lua/configs/lsp.lua +++ b/.config/nvim/lua/configs/lsp.lua diff --git a/.config/nvim_pack/lua/configs/vim-plug.lua b/.config/nvim/lua/configs/vim-plug.lua index 01620e1..01620e1 100644 --- a/.config/nvim_pack/lua/configs/vim-plug.lua +++ b/.config/nvim/lua/configs/vim-plug.lua diff --git a/.config/nvim/lua/plugins/marks.lua b/.config/nvim/lua/plugins/marks.lua index 1d452ce..841d390 100644 --- a/.config/nvim/lua/plugins/marks.lua +++ b/.config/nvim/lua/plugins/marks.lua @@ -1,9 +1,11 @@ -return { +vim.pack.add({ { - -- https://github.com/chentoast/marks.nvim - -- Makes marks visible - "chentoast/marks.nvim", - event = "VeryLazy", - opts = {}, - } -} + src = 'https://github.com/chentoast/marks.nvim.git', + version = 'main', + }, +}) + +require("marks").setup({ + event = "VeryLazy", + opts = {}, +}) diff --git a/.config/nvim_pack/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua index c085313..c085313 100644 --- a/.config/nvim_pack/lua/plugins/mason.lua +++ b/.config/nvim/lua/plugins/mason.lua diff --git a/.config/nvim/lua/plugins/render-markdown.lua b/.config/nvim/lua/plugins/render-markdown.lua index d0d0639..3f2a800 100644 --- a/.config/nvim/lua/plugins/render-markdown.lua +++ b/.config/nvim/lua/plugins/render-markdown.lua @@ -1,25 +1,8 @@ --- https://github.com/MeanderingProgrammer/render-markdown.nvim -return { - { - 'MeanderingProgrammer/render-markdown.nvim', - opts = {}, - dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' } - }, - { - 'ChuufMaster/markdown-toc', --https://github.com/ChuufMaster/markdown-toc - -- ":GenerateTOC" - -- ":DeleteTOC" - opts = { - - -- The heading level to match (i.e the number of "#"s to match to) max 6 - heading_level_to_match = -1, - - -- Set to True display a dropdown to allow you to select the heading level - ask_for_heading_level = false, - - -- TOC default string - -- WARN - toc_format = '%s- [%s](<%s#%s>)', - } - } -} +vim.pack.add({ + 'https://github.com/nvim-treesitter/nvim-treesitter', + 'https://github.com/nvim-mini/mini.nvim', -- if you use the mini.nvim suite + -- 'https://github.com/nvim-mini/mini.icons', -- if you use standalone mini plugins + -- 'https://github.com/nvim-tree/nvim-web-devicons', -- if you prefer nvim-web-devicons + 'https://github.com/MeanderingProgrammer/render-markdown.nvim', +}) +require('render-markdown').setup({}) -- only mandatory if you want to set custom options diff --git a/.config/nvim_pack/lua/plugins/rustaceanvim.lua b/.config/nvim/lua/plugins/rustaceanvim.lua index dee1dc1..dee1dc1 100644 --- a/.config/nvim_pack/lua/plugins/rustaceanvim.lua +++ b/.config/nvim/lua/plugins/rustaceanvim.lua diff --git a/.config/nvim_pack/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json index f9b72cb..f9b72cb 100644 --- a/.config/nvim_pack/nvim-pack-lock.json +++ b/.config/nvim/nvim-pack-lock.json diff --git a/.config/nvim/LICENSE b/.config/nvim_old/LICENSE index 5002446..5002446 100644 --- a/.config/nvim/LICENSE +++ b/.config/nvim_old/LICENSE diff --git a/.config/nvim/README.md b/.config/nvim_old/README.md index 4d981d5..4d981d5 100644 --- a/.config/nvim/README.md +++ b/.config/nvim_old/README.md diff --git a/.config/nvim_pack/ftplugin/c.lua b/.config/nvim_old/ftplugin/c.lua index 4514ab3..4514ab3 100644 --- a/.config/nvim_pack/ftplugin/c.lua +++ b/.config/nvim_old/ftplugin/c.lua diff --git a/.config/nvim/ftplugin/cpp.lua b/.config/nvim_old/ftplugin/cpp.lua index 4514ab3..4514ab3 100644 --- a/.config/nvim/ftplugin/cpp.lua +++ b/.config/nvim_old/ftplugin/cpp.lua diff --git a/.config/nvim/ftplugin/html.lua b/.config/nvim_old/ftplugin/html.lua index 3fbcec4..3fbcec4 100644 --- a/.config/nvim/ftplugin/html.lua +++ b/.config/nvim_old/ftplugin/html.lua diff --git a/.config/nvim/ftplugin/htmldjango.lua b/.config/nvim_old/ftplugin/htmldjango.lua index 3fbcec4..3fbcec4 100644 --- a/.config/nvim/ftplugin/htmldjango.lua +++ b/.config/nvim_old/ftplugin/htmldjango.lua diff --git a/.config/nvim_pack/ftplugin/json.lua b/.config/nvim_old/ftplugin/json.lua index 3fbcec4..3fbcec4 100644 --- a/.config/nvim_pack/ftplugin/json.lua +++ b/.config/nvim_old/ftplugin/json.lua diff --git a/.config/nvim_pack/ftplugin/lua.lua b/.config/nvim_old/ftplugin/lua.lua index 275b1a9..275b1a9 100644 --- a/.config/nvim_pack/ftplugin/lua.lua +++ b/.config/nvim_old/ftplugin/lua.lua diff --git a/.config/nvim_pack/ftplugin/make.lua b/.config/nvim_old/ftplugin/make.lua index 2ad7f95..2ad7f95 100644 --- a/.config/nvim_pack/ftplugin/make.lua +++ b/.config/nvim_old/ftplugin/make.lua diff --git a/.config/nvim_pack/ftplugin/python.lua b/.config/nvim_old/ftplugin/python.lua index 3fbcec4..3fbcec4 100644 --- a/.config/nvim_pack/ftplugin/python.lua +++ b/.config/nvim_old/ftplugin/python.lua diff --git a/.config/nvim_pack/ftplugin/rust.lua b/.config/nvim_old/ftplugin/rust.lua index 029f0da..029f0da 100644 --- a/.config/nvim_pack/ftplugin/rust.lua +++ b/.config/nvim_old/ftplugin/rust.lua diff --git a/.config/nvim_pack/ftplugin/sh.lua b/.config/nvim_old/ftplugin/sh.lua index 4d8e3f2..4d8e3f2 100644 --- a/.config/nvim_pack/ftplugin/sh.lua +++ b/.config/nvim_old/ftplugin/sh.lua diff --git a/.config/nvim/ftplugin/toml.lua b/.config/nvim_old/ftplugin/toml.lua index 3fbcec4..3fbcec4 100644 --- a/.config/nvim/ftplugin/toml.lua +++ b/.config/nvim_old/ftplugin/toml.lua diff --git a/.config/nvim_pack/ftplugin/xml.lua b/.config/nvim_old/ftplugin/xml.lua index 4d8e3f2..4d8e3f2 100644 --- a/.config/nvim_pack/ftplugin/xml.lua +++ b/.config/nvim_old/ftplugin/xml.lua diff --git a/.config/nvim_old/init.lua b/.config/nvim_old/init.lua new file mode 100644 index 0000000..90379f8 --- /dev/null +++ b/.config/nvim_old/init.lua @@ -0,0 +1,4 @@ +--- General configs -- +require("configs.basic") +require("configs.filetype") +require("configs.lazyvim") diff --git a/.config/nvim/lazy-lock.json b/.config/nvim_old/lazy-lock.json index f8d3a95..f8d3a95 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim_old/lazy-lock.json diff --git a/.config/nvim_pack/lua/configs/basic.lua b/.config/nvim_old/lua/configs/basic.lua index b39412c..f4ccce1 100644 --- a/.config/nvim_pack/lua/configs/basic.lua +++ b/.config/nvim_old/lua/configs/basic.lua @@ -61,6 +61,7 @@ vim.keymap.set('n', '<A-k>', '<cmd>wincmd k<CR>', { desc = 'Move cursor to windo vim.keymap.set('n', '<A-j>', '<cmd>wincmd j<CR>', { desc = 'Move cursor to window below' }) vim.keymap.set('n', '<A-h>', '<cmd>wincmd h<CR>', { desc = 'Move cursor to window left' }) vim.keymap.set('n', '<A-l>', '<cmd>wincmd l<CR>', { desc = 'Move cursor to window right' }) +-------------------------------------------- ----------------- -- Diagnostics -- diff --git a/.config/nvim/lua/configs/filetype.lua b/.config/nvim_old/lua/configs/filetype.lua index 82725e2..82725e2 100644 --- a/.config/nvim/lua/configs/filetype.lua +++ b/.config/nvim_old/lua/configs/filetype.lua diff --git a/.config/nvim/lua/configs/lazyvim.lua b/.config/nvim_old/lua/configs/lazyvim.lua index 0b643b4..0b643b4 100644 --- a/.config/nvim/lua/configs/lazyvim.lua +++ b/.config/nvim_old/lua/configs/lazyvim.lua diff --git a/.config/nvim/lua/plugins/completions.lua b/.config/nvim_old/lua/plugins/completions.lua index 483fac7..483fac7 100644 --- a/.config/nvim/lua/plugins/completions.lua +++ b/.config/nvim_old/lua/plugins/completions.lua diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim_old/lua/plugins/lsp.lua index 0314c42..0314c42 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim_old/lua/plugins/lsp.lua diff --git a/.config/nvim_old/lua/plugins/marks.lua b/.config/nvim_old/lua/plugins/marks.lua new file mode 100644 index 0000000..1d452ce --- /dev/null +++ b/.config/nvim_old/lua/plugins/marks.lua @@ -0,0 +1,9 @@ +return { + { + -- https://github.com/chentoast/marks.nvim + -- Makes marks visible + "chentoast/marks.nvim", + event = "VeryLazy", + opts = {}, + } +} diff --git a/.config/nvim/lua/plugins/none-ls.lua b/.config/nvim_old/lua/plugins/none-ls.lua index ee6d859..ee6d859 100644 --- a/.config/nvim/lua/plugins/none-ls.lua +++ b/.config/nvim_old/lua/plugins/none-ls.lua diff --git a/.config/nvim/lua/plugins/nvim-dap.lua b/.config/nvim_old/lua/plugins/nvim-dap.lua index 5a6d1ae..5a6d1ae 100644 --- a/.config/nvim/lua/plugins/nvim-dap.lua +++ b/.config/nvim_old/lua/plugins/nvim-dap.lua diff --git a/.config/nvim_old/lua/plugins/render-markdown.lua b/.config/nvim_old/lua/plugins/render-markdown.lua new file mode 100644 index 0000000..d0d0639 --- /dev/null +++ b/.config/nvim_old/lua/plugins/render-markdown.lua @@ -0,0 +1,25 @@ +-- https://github.com/MeanderingProgrammer/render-markdown.nvim +return { + { + 'MeanderingProgrammer/render-markdown.nvim', + opts = {}, + dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' } + }, + { + 'ChuufMaster/markdown-toc', --https://github.com/ChuufMaster/markdown-toc + -- ":GenerateTOC" + -- ":DeleteTOC" + opts = { + + -- The heading level to match (i.e the number of "#"s to match to) max 6 + heading_level_to_match = -1, + + -- Set to True display a dropdown to allow you to select the heading level + ask_for_heading_level = false, + + -- TOC default string + -- WARN + toc_format = '%s- [%s](<%s#%s>)', + } + } +} diff --git a/.config/nvim/lua/plugins/rust_analyzer.lua b/.config/nvim_old/lua/plugins/rust_analyzer.lua index 914befe..914befe 100644 --- a/.config/nvim/lua/plugins/rust_analyzer.lua +++ b/.config/nvim_old/lua/plugins/rust_analyzer.lua diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim_old/lua/plugins/telescope.lua index e3ab856..e3ab856 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim_old/lua/plugins/telescope.lua diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim_old/lua/plugins/treesitter.lua index f04198f..f04198f 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim_old/lua/plugins/treesitter.lua diff --git a/.config/nvim_pack/init.lua b/.config/nvim_pack/init.lua deleted file mode 100644 index bfc4b5b..0000000 --- a/.config/nvim_pack/init.lua +++ /dev/null @@ -1,10 +0,0 @@ --- General configs -- -require("configs.basic") -require("configs.vim-plug") -require("configs.lsp") - --- Install plugins with native vim.pack -- -require("plugins.mason") -require("plugins.marks") -require("plugins.render-markdown") -require("plugins.rustaceanvim") diff --git a/.config/nvim_pack/lsp/bashls.lua b/.config/nvim_pack/lsp/bashls.lua deleted file mode 100644 index e69de29..0000000 --- a/.config/nvim_pack/lsp/bashls.lua +++ /dev/null diff --git a/.config/nvim_pack/lsp/clangd.lua b/.config/nvim_pack/lsp/clangd.lua deleted file mode 100644 index e69de29..0000000 --- a/.config/nvim_pack/lsp/clangd.lua +++ /dev/null diff --git a/.config/nvim_pack/lsp/lemminx.lua b/.config/nvim_pack/lsp/lemminx.lua deleted file mode 100644 index e69de29..0000000 --- a/.config/nvim_pack/lsp/lemminx.lua +++ /dev/null diff --git a/.config/nvim_pack/lsp/marksman.lua b/.config/nvim_pack/lsp/marksman.lua deleted file mode 100644 index e69de29..0000000 --- a/.config/nvim_pack/lsp/marksman.lua +++ /dev/null diff --git a/.config/nvim_pack/lua/plugins/marks.lua b/.config/nvim_pack/lua/plugins/marks.lua deleted file mode 100644 index 841d390..0000000 --- a/.config/nvim_pack/lua/plugins/marks.lua +++ /dev/null @@ -1,11 +0,0 @@ -vim.pack.add({ - { - src = 'https://github.com/chentoast/marks.nvim.git', - version = 'main', - }, -}) - -require("marks").setup({ - event = "VeryLazy", - opts = {}, -}) diff --git a/.config/nvim_pack/lua/plugins/render-markdown.lua b/.config/nvim_pack/lua/plugins/render-markdown.lua deleted file mode 100644 index 3f2a800..0000000 --- a/.config/nvim_pack/lua/plugins/render-markdown.lua +++ /dev/null @@ -1,8 +0,0 @@ -vim.pack.add({ - 'https://github.com/nvim-treesitter/nvim-treesitter', - 'https://github.com/nvim-mini/mini.nvim', -- if you use the mini.nvim suite - -- 'https://github.com/nvim-mini/mini.icons', -- if you use standalone mini plugins - -- 'https://github.com/nvim-tree/nvim-web-devicons', -- if you prefer nvim-web-devicons - 'https://github.com/MeanderingProgrammer/render-markdown.nvim', -}) -require('render-markdown').setup({}) -- only mandatory if you want to set custom options |
