diff --git a/lazy-lock.json b/lazy-lock.json index 97670bb..c44b59b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,22 +1,21 @@ { "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, + "fzf-lua": { "branch": "main", "commit": "db45bab4f663bd2e27b257a65611796d682bd0bc" }, "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" }, "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, "image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" }, - "lazy.nvim": { "branch": "main", "commit": "4ded3ff73bf42e1c657e5deb85d8bbd887d0172e" }, + "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" }, "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, - "mini.nvim": { "branch": "main", "commit": "ef89bb115244297ed440441faa61759ddcf4a970" }, + "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" }, "molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" }, "noice.nvim": { "branch": "main", "commit": "38c702be0d8fea81527ee6a73e1e834e72481193" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-lspconfig": { "branch": "master", "commit": "e688b486fe9291f151eae7e5c0b5a5c4ef980847" }, + "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, - "nvim-treesitter": { "branch": "main", "commit": "3ab4f2d2d20be55874e2eb575145c6928d7d7d0e" }, - "oil.nvim": { "branch": "master", "commit": "919e155fdf38e9148cdb5304faaaf53c20d703ea" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "render-markdown.nvim": { "branch": "main", "commit": "d53856423be5ef3c267d26ee261b0981b372f718" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "nvim-treesitter": { "branch": "main", "commit": "63fac0a576bc78a4790cbcce24646cca860bc8c1" }, + "oil.nvim": { "branch": "master", "commit": "71948729cda5fc1b761d6ae60ff774b5525f1d50" }, + "render-markdown.nvim": { "branch": "main", "commit": "475d3ad8cae486b0df6fc6050cf5b5ea1de42db8" }, "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" }, "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" } } diff --git a/lua/config/init.lua b/lua/config/init.lua index bd4094e..8bc874d 100644 --- a/lua/config/init.lua +++ b/lua/config/init.lua @@ -2,3 +2,6 @@ require("config.vars") require("config.keybinds") require("config.lazy") + +require("config.treesitter") + diff --git a/lua/config/treesitter.lua b/lua/config/treesitter.lua new file mode 100644 index 0000000..c18988e --- /dev/null +++ b/lua/config/treesitter.lua @@ -0,0 +1,12 @@ + +vim.api.nvim_create_autocmd('FileType', { + callback = function(args) + local ft = args.match + --local lang = vim.treesitter.language.get_lang(ft) + if (vim.treesitter.language.get_lang(ft) ~= nil) then + --vim.treesitter.start() + end + pcall(vim.treesitter.start) + end +}) + diff --git a/lua/config/vars.lua b/lua/config/vars.lua index c277012..03e1920 100644 --- a/lua/config/vars.lua +++ b/lua/config/vars.lua @@ -25,13 +25,13 @@ vim.opt.isfname:append("@-@") vim.opt.updatetime = 50 -vim.opt.conceallevel = 1 +vim.opt.conceallevel = 2 vim.g.mapleader = " " vim.g.maplocalleader = "," -- set python path -vim.g.python3_host_prog = os.getenv("HOME") .. "/.micromamba/envs/nvim/bin/python" +--vim.g.python3_host_prog = os.getenv("HOME") .. "/.micromamba/envs/nvim/bin/python" -- disable mouse vim.opt.mouse = "" diff --git a/lua/plugins/fzf.lua b/lua/plugins/fzf.lua new file mode 100644 index 0000000..7951ba5 --- /dev/null +++ b/lua/plugins/fzf.lua @@ -0,0 +1,14 @@ +return { + 'ibhagwan/fzf-lua', + dependencies = { + 'nvim-mini/mini.icons', + }, + cmd = { + 'FzfLua', + }, + keys = { + { '', 'FzfLua files', mode = 'n', desc = 'Search in project' }, + { '/', 'FzfLua live_grep', mode = 'n', desc = 'Search string in project' }, + }, +} + diff --git a/lua/plugins/markdown.lua b/lua/plugins/markdown.lua index b7b78d4..b889e42 100644 --- a/lua/plugins/markdown.lua +++ b/lua/plugins/markdown.lua @@ -2,9 +2,28 @@ return { 'MeanderingProgrammer/render-markdown.nvim', dependencies = { 'nvim-treesitter/nvim-treesitter', - 'nvim-mini/mini.nvim', + 'nvim-mini/mini.icons', }, ---@module 'render-markdown' ---@type render.md.UserConfig + opts = { + completions = { + lsp = { + enabled = true, + }, + }, + }, + config = function() + --vim.api.nvim_set_hl(0, 'RenderMarkdownH1Bg', { bg = '#79740e'}) + end, + keys = { + { 'mde', 'RenderMarkdown buf_enable', mode = 'n', desc = 'enable Markdown view' }, + { 'mdd', 'RenderMarkdown buf_disable', mode = 'n', desc = 'disable Markdown view' }, + }, + latex = { + converter = { + 'latex2text', + }, + }, } diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua new file mode 100644 index 0000000..056f04f --- /dev/null +++ b/lua/plugins/mini.lua @@ -0,0 +1,4 @@ +return { + 'nvim-mini/mini.icons', +} + diff --git a/lua/plugins/notify.lua b/lua/plugins/notify.lua index e53ef26..d09ddad 100644 --- a/lua/plugins/notify.lua +++ b/lua/plugins/notify.lua @@ -1,4 +1,7 @@ return { 'rcarriga/nvim-notify', + opts = { + background_colour = "#000000", + }, } diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua deleted file mode 100644 index f9b5a20..0000000 --- a/lua/plugins/telescope.lua +++ /dev/null @@ -1,26 +0,0 @@ -return { - 'nvim-telescope/telescope.nvim', - branch = '0.1.x', - requires = { - { 'nvim-lua/plenary.nvim' }, - }, - config = function() - require('telescope').load_extension("notify") - end, - keys = { - { "ff", "Telescope find_files", mode = "n" }, - { "g", "Telescope live_grep", mode = "n" }, - { "", "Telescope git_files", mode = "n" }, - }, - cmd = { - 'Telescope', - }, - opts = { - defaults = { - preview = { - treesitter = false, - }, - }, - }, -} -