diff --git a/lazy-lock.json b/lazy-lock.json index 508c055..c2a2df2 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,32 +1,26 @@ { - "LuaSnip": { "branch": "master", "commit": "5271933f7cea9f6b1c7de953379469010ed4553a" }, - "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, - "conform.nvim": { "branch": "master", "commit": "0e93e0d12d2f7ebdea9e3e444dfaff0050cefbe6" }, + "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" }, + "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "fzf-lua": { "branch": "main", "commit": "1977a7648a264fabf453ee082e2398e38cc3b588" }, "gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" }, - "grug-far.nvim": { "branch": "main", "commit": "c36f5f9b53f12a60aa53d42282e8ae78aef72178" }, - "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, + "grug-far.nvim": { "branch": "main", "commit": "1a85fba510c6086b396be5a3c7c77ab32829d7df" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, - "markdown.nvim": { "branch": "main", "commit": "6f5a4c36d9383b2a916facaa63dcd573afa11ee8" }, + "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, + "markdown.nvim": { "branch": "main", "commit": "6d03af10063d5a2fadec3559de5dfa68da7d00ef" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" }, "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, - "neo-tree.nvim": { "branch": "main", "commit": "f3e8633f06007e015f855d3c1ec0cee23af14d8e" }, - "nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" }, - "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "036885e8e5456d3907626b634693234f628afef6" }, + "neo-tree.nvim": { "branch": "main", "commit": "e01ca7de8e6dbc6118bcb12c4cbe1f88162a337f" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-lspconfig": { "branch": "master", "commit": "77d3fdfb3554632c7a3b101ded643d422de7626f" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index a608b93..db4a829 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -1,78 +1,92 @@ return { { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - }, - config = function() - local cmp = require("cmp") - - cmp.setup({ - -- Highlights the first result always - completion = { - completeopt = "menu,menuone,noinsert", - }, - window = { - completion = cmp.config.window.bordered({ - side_padding = 1, - scrollbar = false, - }), - }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - else - fallback() - end - end, { "i" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - else - fallback() - end - end, { "i" }), - [""] = cmp.mapping.confirm({ select = true }), - }), - - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) - end, - }, - - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "nvim_lsp_signature_help" }, - { name = "luasnip" }, - }, { - { name = "buffer" }, - }), - }) - end, - }, - { - "L3MON4D3/LuaSnip", - dependencies = { - { - "rafamadriz/friendly-snippets", - config = function() - require("luasnip.loaders.from_vscode").lazy_load({ - exclude = { "html" }, - }) - end, - }, - }, - build = "make install_jsregexp", + "saghen/blink.cmp", + dependencies = { "rafamadriz/friendly-snippets" }, + version = "1.*", opts = { - history = true, - delete_check_events = "TextChanged", + keymap = { + preset = "enter", + [""] = { "select_prev", "fallback" }, + [""] = { "select_next", "fallback" }, + [""] = { "select_and_accept", "fallback" }, + }, + completion = { documentation = { auto_show = true } }, }, }, + -- { + -- "hrsh7th/nvim-cmp", + -- dependencies = { + -- "hrsh7th/cmp-nvim-lsp", + -- "hrsh7th/cmp-buffer", + -- }, + -- config = function() + -- local cmp = require("cmp") + -- + -- cmp.setup({ + -- -- Highlights the first result always + -- completion = { + -- completeopt = "menu,menuone,noinsert", + -- }, + -- window = { + -- completion = cmp.config.window.bordered({ + -- side_padding = 1, + -- scrollbar = false, + -- }), + -- }, + -- mapping = cmp.mapping.preset.insert({ + -- [""] = cmp.mapping.scroll_docs(-4), + -- [""] = cmp.mapping.scroll_docs(4), + -- [""] = cmp.mapping.complete(), + -- [""] = cmp.mapping.abort(), + -- [""] = cmp.mapping(function(fallback) + -- if cmp.visible() then + -- cmp.select_next_item() + -- else + -- fallback() + -- end + -- end, { "i" }), + -- [""] = cmp.mapping(function(fallback) + -- if cmp.visible() then + -- cmp.select_prev_item() + -- else + -- fallback() + -- end + -- end, { "i" }), + -- [""] = cmp.mapping.confirm({ select = true }), + -- }), + -- + -- snippet = { + -- expand = function(args) + -- require("luasnip").lsp_expand(args.body) + -- end, + -- }, + -- + -- sources = cmp.config.sources({ + -- { name = "nvim_lsp" }, + -- { name = "nvim_lsp_signature_help" }, + -- { name = "luasnip" }, + -- }, { + -- { name = "buffer" }, + -- }), + -- }) + -- end, + -- }, + -- { + -- "L3MON4D3/LuaSnip", + -- dependencies = { + -- { + -- "rafamadriz/friendly-snippets", + -- config = function() + -- require("luasnip.loaders.from_vscode").lazy_load({ + -- exclude = { "html" }, + -- }) + -- end, + -- }, + -- }, + -- build = "make install_jsregexp", + -- opts = { + -- history = true, + -- delete_check_events = "TextChanged", + -- }, + -- }, } diff --git a/lua/plugins/fzf.lua b/lua/plugins/fzf.lua new file mode 100644 index 0000000..966dc6c --- /dev/null +++ b/lua/plugins/fzf.lua @@ -0,0 +1,29 @@ +return { + { + "ibhagwan/fzf-lua", + dependencies = { "nvim-tree/nvim-web-devicons" }, + opts = {}, + keys = { + { + "ff", + "FzfLua files", + "Search files", + }, + { + "fg", + "FzfLua live_grep", + "Grep files", + }, + { + "fb", + "FzfLua buffers", + "Search buffers", + }, + { + "fr", + "FzfLua resume", + "Resume search", + }, + }, + }, +} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 2d570c1..eba804e 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -19,8 +19,8 @@ return { "lua_ls", "phpactor", -- php "taplo", -- .toml - "ts_ls", "twiggy_language_server", -- .twig + "vtsls", -- .ts "yamlls", -- .yml }, }, @@ -44,8 +44,8 @@ return { lua_ls = {}, phpactor = {}, taplo = {}, - ts_ls = {}, twiggy_language_server = {}, + vtsls = {}, yamlls = {}, }, }, diff --git a/lua/plugins/snack.lua b/lua/plugins/snack.lua index 3256280..c52a3ac 100644 --- a/lua/plugins/snack.lua +++ b/lua/plugins/snack.lua @@ -5,6 +5,7 @@ return { opts = { dashboard = { enabled = true }, git = { enabled = true }, + indent = { enabled = true }, lazygit = { enabled = true }, notifier = { enabled = true }, quickfile = { enabled = true }, diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua deleted file mode 100644 index 350c3fe..0000000 --- a/lua/plugins/telescope.lua +++ /dev/null @@ -1,58 +0,0 @@ -return { - { - "nvim-telescope/telescope.nvim", - tag = "0.1.6", - dependencies = { "nvim-lua/plenary.nvim" }, - keys = { - { - "ff", - "lua require'telescope.builtin'.git_files{}", - desc = "Search git_files", - }, - { - "fg", - "lua require'telescope.builtin'.live_grep{}", - desc = "Grep git_files", - }, - { - "fh", - "lua require'telescope.builtin'.help_tags{}", - desc = "View help tags", - }, - { - "fb", - "lua require'telescope.builtin'.buffers{}", - desc = "Search buffers", - }, - { - "sk", - "lua require'telescope.builtin'.keymaps{}", - desc = "View keymaps", - }, - { - "sR", - "lua require'telescope.builtin'.resume{}", - desc = "Resume", - }, - { - "st", - "TodoTelescope", - desc = "Search TODOs", - }, - }, - }, - { - "nvim-telescope/telescope-ui-select.nvim", - config = function() - require("telescope").setup({ - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown({}), - }, - }, - }) - - require("telescope").load_extension("ui-select") - end, - }, -} diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 58ac8b6..da3b32e 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -27,63 +27,4 @@ return { }, }, }, - { - "lukas-reineke/indent-blankline.nvim", - opts = { - indent = { - char = "│", - tab_char = "│", - }, - scope = { enabled = false }, - exclude = { - filetypes = { - "Trouble", - "alpha", - "dashboard", - "help", - "lazy", - "mason", - "neo-tree", - "notify", - "snacks_dashboard", - "snacks_notif", - "snacks_terminal", - "snacks_win", - "toggleterm", - "trouble", - }, - }, - }, - main = "ibl", - }, - { - "echasnovski/mini.indentscope", - opts = { - symbol = "│", - options = { try_as_border = true }, - }, - init = function() - vim.api.nvim_create_autocmd("FileType", { - pattern = { - "Trouble", - "alpha", - "dashboard", - "help", - "lazy", - "mason", - "neo-tree", - "notify", - "snacks_dashboard", - "snacks_notif", - "snacks_terminal", - "snacks_win", - "toggleterm", - "trouble", - }, - callback = function(data) - vim.b[data.buf].miniindentscope_disable = true - end, - }) - end, - }, }