diff --git a/neovim/default.nix b/neovim/default.nix index a52092c..b0574f5 100644 --- a/neovim/default.nix +++ b/neovim/default.nix @@ -12,9 +12,11 @@ # theme nvim-solarized-lua - delimitMate - vim-bbye - ansible-vim + # auto-close brackets, etc + nvim-autopairs + + # better wildmenu + wilder-nvim # ui dressing-nvim @@ -37,11 +39,8 @@ indent-blankline-nvim plenary-nvim vim-illuminate - registers-nvim vim-surround - editorconfig-nvim - # git gitsigns-nvim vim-fugitive @@ -132,12 +131,6 @@ lua << EOF vim.o.guifont = "DejaVu Sans Mono:h10" - if vim.g.neovide then - vim.g.neovide_fullscreen = true - vim.g.neovide_cursor_animation_length = 0.01 - vim.g.neovide_cursor_trail_length = 0.01 - end - ${builtins.readFile ./keymaps.lua } ${builtins.readFile ./options.lua } ${builtins.readFile ./commands.lua } @@ -162,8 +155,11 @@ ${builtins.readFile ./dap.lua } ${builtins.readFile ./neorg.lua } ${builtins.readFile ./illuminate.lua } + ${builtins.readFile ./wilder.lua } vim.g.gitblame_date_format = "%r" + + require("nvim-autopairs").setup({}) EOF ''; }; diff --git a/neovim/keymaps.lua b/neovim/keymaps.lua index 18b7360..2179b03 100644 --- a/neovim/keymaps.lua +++ b/neovim/keymaps.lua @@ -60,7 +60,7 @@ vim.api.nvim_create_autocmd("TermOpen", { }) -- buffer closing -nnoremap("gq", ":Bdelete") +nnoremap("gq", ":bdelete") -- toggle search highlighting vim.cmd('nnoremap * v:hlsearch ? ":nohlsearch" : "*"') diff --git a/neovim/wilder.lua b/neovim/wilder.lua new file mode 100644 index 0000000..9a11ef7 --- /dev/null +++ b/neovim/wilder.lua @@ -0,0 +1,32 @@ +local wilder = require('wilder') + +wilder.setup({ modes = { ':', '/', '?' } }) + +wilder.set_option('pipeline', { + wilder.branch( + wilder.python_file_finder_pipeline({ + file_command = { "rg", "--files" }, + dir_command = { 'find', '.', '-type', 'd', '-printf', '%P\n' }, + filters = { 'fuzzy_filter', 'difflib_sorter' }, + }), + wilder.cmdline_pipeline({ + language = "python", + fuzzy = 1, + }), + wilder.python_search_pipeline({ + pattern = wilder.python_fuzzy_pattern(), + sorter = wilder.python_difflib_sorter(), + engine = 're', + }) + ) +}) + +-- Set renderer +wilder.set_option('renderer', wilder.popupmenu_renderer({ + highlighter = wilder.basic_highlighter(), + left = { ' ', wilder.popupmenu_devicons() }, + right = { ' ', wilder.popupmenu_scrollbar() }, + pumblend = 20, + max_height = '15', -- Adjust the maximum height as needed + border = 'rounded', -- Border style can be 'single', 'double', etc. +}))