diff --git a/vim/.vim/lua/plugins/base.lua b/vim/.vim/lua/plugins/base.lua index ed833e1..d1d99f3 100644 --- a/vim/.vim/lua/plugins/base.lua +++ b/vim/.vim/lua/plugins/base.lua @@ -2,6 +2,16 @@ local use_google = require("utils").use_google local buf_too_large = require("utils").buf_too_large return { + { + "Bekaboo/dropbar.nvim", + -- optional, but required for fuzzy finder support + dependencies = { + "nvim-telescope/telescope-fzf-native.nvim", + }, + -- config = function() + -- vim.ui.select = require("dropbar.utils.menu").select + -- end, + }, { "RRethy/vim-illuminate", config = function() diff --git a/vim/.vim/lua/plugins/luasnip.lua b/vim/.vim/lua/plugins/luasnip.lua index a35bfb4..078eb8a 100644 --- a/vim/.vim/lua/plugins/luasnip.lua +++ b/vim/.vim/lua/plugins/luasnip.lua @@ -1,4 +1,10 @@ return { + { + "danymat/neogen", + config = function() + require("neogen").setup({ snippet_engine = "luasnip" }) + end, + }, { "L3MON4D3/LuaSnip", -- follow latest release. @@ -7,4 +13,23 @@ return { build = "make install_jsregexp", }, { "saadparwaiz1/cmp_luasnip" }, + config = function() + local ls = require("luasnip") + + vim.keymap.set({ "i" }, "", function() + ls.expand() + end, { silent = true }) + vim.keymap.set({ "i", "s" }, "", function() + ls.jump(1) + end, { silent = true }) + vim.keymap.set({ "i", "s" }, "", function() + ls.jump(-1) + end, { silent = true }) + + vim.keymap.set({ "i", "s" }, "", function() + if ls.choice_active() then + ls.change_choice(1) + end + end, { silent = true }) + end, } diff --git a/vim/.vim/lua/plugins/telescope.lua b/vim/.vim/lua/plugins/telescope.lua index e2ffe70..b66151f 100644 --- a/vim/.vim/lua/plugins/telescope.lua +++ b/vim/.vim/lua/plugins/telescope.lua @@ -51,7 +51,7 @@ end local keys = { { "", ":lua find_files(scopes.get_current_dirs())", desc = "Find Files in CWD" }, { "e", ":lua search_cwd()", desc = "Find Files in Buffer Directory" }, - { ".", ":lua live_grep(%%)", desc = "Find Files in Buffer Directory" }, + { ".", ':lua live_grep({vim.fn.expand("%%")})', desc = "Find Files in Buffer Directory" }, { "tc", ":Telescope textcase", desc = "Text case" }, { "tC", ":CritiqueCommentsTelescope", desc = "Text case" }, { "t.", ":lua find_dotfiles()", desc = "Find Dotfiles" }, diff --git a/vim/.vimrc b/vim/.vimrc index e551252..44cf1dd 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -120,7 +120,5 @@ let g:loaded_netrwPlugin = 0 let g:loaded_tutor_mode_plugin = 0 let g:loaded_remote_plugins = 1 -set mouse= - filetype plugin indent on syntax on