diff options
| -rw-r--r-- | nvim/init.lua | 6 | ||||
| -rw-r--r-- | nvim/lua/config/fzf.lua | 9 | ||||
| -rw-r--r-- | nvim/lua/config/lazy.lua | 3 | ||||
| -rw-r--r-- | zsh/index.zsh | 4 |
4 files changed, 17 insertions, 5 deletions
diff --git a/nvim/init.lua b/nvim/init.lua index 8a429a5..310e220 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -6,12 +6,9 @@ vim.o.ignorecase = true vim.o.number = true vim.cmd([[colorscheme gruvbox]]) -vim.keymap.set('n', '<C-p>', ':FzfLua files<CR>', { silent = true }) -vim.keymap.set('n', 'gz', ':FzfLua<CR>', { silent = true }) -vim.keymap.set('n', 'g<C-p>', ':FzfLua grep_visual<CR>', { silent = true }) vim.keymap.set('n', 'gl', vim.diagnostic.open_float, { noremap = true, silent = true }) vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { noremap = true, silent = true }) -vim.keymap.set("n", 'gD', vim.lsp.buf.declaration, { noremap = true, silent = true }) +vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, { noremap = true, silent = true }) vim.diagnostic.config({ virtual_text = true, }) @@ -25,3 +22,4 @@ vim.api.nvim_create_autocmd("BufWritePre", { end, }) +vim.g.mapleader = "<Space>" diff --git a/nvim/lua/config/fzf.lua b/nvim/lua/config/fzf.lua new file mode 100644 index 0000000..e0d68ed --- /dev/null +++ b/nvim/lua/config/fzf.lua @@ -0,0 +1,9 @@ +require('fzf-lua').setup({}) + +local opts = { silent = true } + +vim.keymap.set('n', '<leader>ff', ':FzfLua global<CR>', opts) +vim.keymap.set('n', '<leader>lr', ':FzfLua lsp_references<CR>', opts) +vim.keymap.set('n', '<leader>gbc', ':FzfLua git_bcommits<CR>', opts) +vim.keymap.set('n', '<leader>gc', ':FzfLua git_commits<CR>', opts) +vim.keymap.set('n', '<leader>rp', ':FzfLua grep_project<CR>', opts) diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua index 27eb115..ca9651b 100644 --- a/nvim/lua/config/lazy.lua +++ b/nvim/lua/config/lazy.lua @@ -52,6 +52,9 @@ require("lazy").setup({ -- Fuzzy finder { "ibhagwan/fzf-lua", + config = function() + require("config.fzf") + end, dependencies = { "nvim-tree/nvim-web-devicons" }, opts = {}, }, diff --git a/zsh/index.zsh b/zsh/index.zsh index e0f3376..375384c 100644 --- a/zsh/index.zsh +++ b/zsh/index.zsh @@ -2,7 +2,6 @@ HISTFILE=~/.histfile HISTSIZE=1000 SAVEHIST=1000 -EDITOR=nvim bindkey -e # End of lines configured by zsh-newuser-install # @@ -23,3 +22,6 @@ alias tg='git describe --tags HEAD' eval $(ssh-agent -s) >> /dev/null # Set up fzf key bindings and fuzzy completion source <(fzf --zsh) + +alias rr=ranger +export EDITOR=nvim |