diff options
Diffstat (limited to '.config')
| -rw-r--r-- | .config/nvim/lua/config/bindings.lua | 19 | ||||
| -rw-r--r-- | .config/nvim/lua/config/lazy.lua | 42 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp/luals.lua | 9 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/telescope.lua | 25 |
4 files changed, 48 insertions, 47 deletions
diff --git a/.config/nvim/lua/config/bindings.lua b/.config/nvim/lua/config/bindings.lua index 2c5f869..d7a1213 100644 --- a/.config/nvim/lua/config/bindings.lua +++ b/.config/nvim/lua/config/bindings.lua @@ -28,7 +28,7 @@ vim.keymap.set('x', '<leader>p', "\"_dP") vim.keymap.set('n', 'Q', '<nop>') vim.keymap.set('n', '<leader><space>', vim.cmd.nohlsearch, { noremap = true, silent = true }) -local ts = require('telescope.builtin') +local fzf = require('fzf-lua') require('telescope').load_extension('harpoon') local harpoon = require('harpoon') harpoon:setup() @@ -47,7 +47,7 @@ vim.keymap.set('n', '<leader>u', ':w<CR>', { noremap = true, silent = true }) -- harpoon vim.keymap.set('n', '<leader>aa', function() harpoon:list():add() end, { noremap = true, silent = true }) vim.keymap.set('n', '<leader>ae', function() harpoon.ui:toggle_quick_menu(harpoon:list()) end, { noremap = true, silent = true }) -vim.keymap.set('n', '<leader>af', ':Telescope harpoon marks<CR>', { noremap = true, silent = true }) +-- vim.keymap.set('n', '<leader>af', ':Telescope harpoon marks<CR>', { noremap = true, silent = true }) -- trouble vim.keymap.set('n', '<leader>xx', ':Trouble diagnostics toggle focus=true<CR>', { noremap = true, silent = true }) vim.keymap.set('n', '<leader>xw', ':Trouble diagnostics toggle focus=true<CR>', { noremap = true, silent = true }) @@ -56,14 +56,11 @@ vim.keymap.set('n', '<leader>xl', ':Trouble loclist toggle focus=true<CR>', { no vim.keymap.set('n', '<leader>xq', ':Trouble qflist toggle focus=true<CR>', { noremap = true, silent = true }) vim.keymap.set('n', '<leader>xs', ':Trouble lsp toggle focus=true win.position=right<CR>', { noremap = true, silent = true }) -- telescope -vim.keymap.set('n', '<leader>fb', ts.buffers, { noremap = true, silent = true }) -vim.keymap.set('n', '<leader>fd', ts.diagnostics, { noremap = true, silent = true }) -vim.keymap.set('n', '<leader>fe', ':Telescope harpoon marks<CR>', { noremap = true, silent = true }) -vim.keymap.set('n', '<leader>ff', ts.find_files, { noremap = true, silent = true }) -vim.keymap.set('n', '<leader>fs', ts.live_grep, { noremap = true, silent = true }) -vim.keymap.set('n', '<leader>fg', function() ts.grep_string({ search = vim.fn.input("Grep > ") }) end, { noremap = true, silent = true }) -vim.keymap.set('n', '<leader>ft', ':TodoTelescope keywords=TODO,HACK,WARN,PERF,NOTE,TEST,FIX<CR>', { noremap = true, silent = true }) +vim.keymap.set('n', '<leader>fb', fzf.buffers, { noremap = true, silent = true }) +vim.keymap.set('n', '<leader>fd', fzf.diagnostics_workspace, { noremap = true, silent = true }) +vim.keymap.set('n', '<leader>ff', fzf.files, { noremap = true, silent = true }) +vim.keymap.set('n', '<leader>fs', fzf.live_grep_native, { noremap = true, silent = true }) +vim.keymap.set('n', '<leader>ft', ':TodoFzfLua keywords=TODO,HACK,WARN,PERF,NOTE,TEST,FIX<CR>', { noremap = true, silent = true }) -- neovim -vim.keymap.set('n', '<leader>vu', vim.cmd.Lazy, { noremap = true, silent = true }) -vim.keymap.set('n', '<leader>vm', vim.cmd.Mason, { noremap = true, silent = true }) +vim.keymap.set('n', '<leader>vu', ':Lazy sync', { noremap = true, silent = true }) vim.keymap.set('n', '<leader>vv', vim.cmd.Ex, { noremap = true, silent = true }) diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua index 64d930a..fefe2af 100644 --- a/.config/nvim/lua/config/lazy.lua +++ b/.config/nvim/lua/config/lazy.lua @@ -33,17 +33,15 @@ require('lazy').setup({ }, { 'numToStr/Comment.nvim', - requires = { {'JoosepAlviste/nvim-ts-context-commentstring'} }, - config = function() - require('Comment').setup() - end + dependencies = { 'JoosepAlviste/nvim-ts-context-commentstring' }, + config = function() require('Comment').setup {} end }, { 'mbbill/undotree' }, { 'chrisbra/csv.vim' }, { 'ThePrimeagen/harpoon', branch = 'harpoon2', - requires = { {'nvim-lua/plenary.nvim'} } + dependencies = { 'nvim-lua/plenary.nvim' } }, { 'lukas-reineke/indent-blankline.nvim', @@ -60,7 +58,7 @@ require('lazy').setup({ }, { 'folke/todo-comments.nvim', - requires = { {'nvim-lua/plenary.nvim'} }, + dependencies = { 'nvim-lua/plenary.nvim' }, config = function() require('todo-comments.config').setup{ highlight = { @@ -93,13 +91,11 @@ require('lazy').setup({ 'kylechui/nvim-surround', version = "^3.0.0", event = "VeryLazy", - config = function() - require('nvim-surround').setup() - end + config = function() require('nvim-surround').setup {} end }, { 'ggandor/leap.nvim', - requires = {'tpope/vim-repeat'}, + dependencies = { 'tpope/vim-repeat' }, config = function() require('leap').setup({}) vim.keymap.set({'n', 'x', 'o'}, '<leader>s', '<Plug>(leap-forward-to)') @@ -108,6 +104,32 @@ require('lazy').setup({ vim.keymap.set({'n', 'x', 'o'}, '<C-S-s>', '<Plug>(leap-backward-till)') end }, + { + 'ibhagwan/fzf-lua', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + opts = { + defaults = { + file_icons = false, + no_header = true, + no_header_i = true, + }, + winopts = { + width = 1, + height = 0.45, + row = 1, + border = 'none', + preview = { + border = 'none', + title = false + }, + previewers = { + builtin = { + syntax_limit_b = 1024 * 100, + }, + } + } + } + }, { import = "plugins" }, }, }) diff --git a/.config/nvim/lua/lsp/luals.lua b/.config/nvim/lua/lsp/luals.lua index 0b24166..40d4c3d 100644 --- a/.config/nvim/lua/lsp/luals.lua +++ b/.config/nvim/lua/lsp/luals.lua @@ -1,7 +1,14 @@ vim.lsp.config('luals', { cmd = {'lua-language-server'}, filetypes = {'lua'}, - root_markers = {'.luarc.json', '.luarc.jsonc'} + root_markers = {'.luarc.json', '.luarc.jsonc'}, + settings = { + Lua = { + diagnostics = { + globals = { "vim" } + } + } + } }) vim.lsp.enable('luals') diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua deleted file mode 100644 index ca80e16..0000000 --- a/.config/nvim/lua/plugins/telescope.lua +++ /dev/null @@ -1,25 +0,0 @@ -return { - { - 'nvim-telescope/telescope.nvim', - branch = '0.1.x', - dependencies = { 'nvim-lua/plenary.nvim' }, - config = function() - local tele = require('telescope') - - tele.setup { - defaults = { - mappings = { - i = { - ['<C-u>'] = false, - ['<C-d>'] = require('telescope.actions').delete_buffer, - ["<C-j>"] = require('telescope.actions').move_selection_next, - ["<C-k>"] = require('telescope.actions').move_selection_previous, - }, - }, - }, - } - - pcall(tele.load_extension, 'fzf') - end, - }, -} |