From ea74e9076e304637e95ccc6f3325b63888d77acc Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Tue, 28 Sep 2021 23:45:58 +0700 Subject: [PATCH] neovim: disable rarely used wilder.nvim + conjure --- home/.config/nvim/lua/modules/completion.lua | 3 ++- home/.config/nvim/lua/modules/editor.lua | 8 ++++---- home/.config/nvim/lua/modules/tools.lua | 21 +++++++++++++++----- home/.config/nvim/lua/plugins.lua | 14 +++++++------ 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/lua/modules/completion.lua b/home/.config/nvim/lua/modules/completion.lua index 0d136da..709085c 100644 --- a/home/.config/nvim/lua/modules/completion.lua +++ b/home/.config/nvim/lua/modules/completion.lua @@ -55,6 +55,7 @@ function M.cmp_conf() -- cmp_tabnine = '[TN]', latex_symbols = '[TEX]', -- tmux = '[TMUX]', + -- conjure = '[CJ]', orgmode = '[ORG]' })[entry.source.name] @@ -119,9 +120,9 @@ function M.cmp_conf() -- {name = 'treesitter'}, {name = 'nvim_lsp'}, -- {name = 'cmp_tabnine'}, - {name = 'conjure'}, {name = 'latex_symbols'}, -- {name = 'tmux'}, + -- {name = 'conjure'}, {name = 'orgmode'} } } diff --git a/home/.config/nvim/lua/modules/editor.lua b/home/.config/nvim/lua/modules/editor.lua index ffe3278..d3d277e 100644 --- a/home/.config/nvim/lua/modules/editor.lua +++ b/home/.config/nvim/lua/modules/editor.lua @@ -41,10 +41,10 @@ function M.blankline_conf() -- vim.api.nvim_command('autocmd CursorMoved * IndentBlanklineRefresh') end -function M.aniseed_conf() - -- Compile fennel config to lua on startup - require('aniseed.env').init() -end +-- function M.aniseed_conf() +-- -- Compile fennel config to lua on startup +-- require('aniseed.env').init() +-- end function M.treesitter_conf() vim.api.nvim_command('set foldmethod=expr') diff --git a/home/.config/nvim/lua/modules/tools.lua b/home/.config/nvim/lua/modules/tools.lua index 3fd8303..1082732 100644 --- a/home/.config/nvim/lua/modules/tools.lua +++ b/home/.config/nvim/lua/modules/tools.lua @@ -223,8 +223,18 @@ end -- vim.api.nvim_command [[ -- call wilder#set_option('renderer', wilder#renderer_mux({ -- \ ':': wilder#popupmenu_renderer({ --- \ 'highlighter': wilder#basic_highlighter(), --- \ 'left': wilder#popupmenu_devicons(), +-- \ 'highlighter': [ +-- \ wilder#pcre2_highlighter(), +-- \ wilder#python_cpsm_highlighter() +-- \ ], +-- \ 'left': [ +-- \ ' ', +-- \ wilder#popupmenu_devicons(), +-- \ wilder#popupmenu_buffer_flags({ +-- \ 'flags': ' a + ', +-- \ 'icons': {'+': '', 'a': '', 'h': ''} +-- \ }) +-- \ ], -- \ 'right': [' ', wilder#popupmenu_scrollbar()] -- \ }), -- \ '/': wilder#wildmenu_renderer({ @@ -240,10 +250,11 @@ end -- \ wilder#branch( -- \ wilder#python_file_finder_pipeline({ -- \ 'file_command': ['fd', '--type', 'f', '--follow', '--hidden', '--exclude', '.git'], --- \ 'dir_command': ['fd', '--type', 'd', '--follow', '--hidden', '--exclude', '.git'] +-- \ 'dir_command': ['fd', '--type', 'd', '--follow', '--hidden', '--exclude', '.git'], +-- \ 'filters': ['cpsm_filter', 'fuzzy_filter'] -- \ }), --- \ wilder#cmdline_pipeline({'language': 'python'}), --- \ wilder#python_search_pipeline() +-- \ wilder#cmdline_pipeline({'language': 'python', 'fuzzy': 1, 'set_pcre2_patter': v:true}), +-- \ wilder#python_search_pipeline({'pattern': 'fuzzy'}) -- \ ) -- \ ]) -- ]] diff --git a/home/.config/nvim/lua/plugins.lua b/home/.config/nvim/lua/plugins.lua index 7ece32a..7b2a0c4 100644 --- a/home/.config/nvim/lua/plugins.lua +++ b/home/.config/nvim/lua/plugins.lua @@ -80,11 +80,11 @@ return packer.startup(function(use) after = 'nvim-treesitter', config = editor.blankline_conf } - use { -- TODO: config (lua -> fennel) + learn clojure, fennel, guile scheme - 'Olical/conjure', - ft = {'clojure', 'fennel', 'scheme'}, - requires = {{'Olical/aniseed', config = editor.aniseed_conf}} - } + -- use { -- TODO: config (lua -> fennel) + learn clojure, fennel, guile scheme + -- 'Olical/conjure', + -- ft = {'clojure', 'fennel', 'scheme'}, + -- requires = {{'Olical/aniseed', config = editor.aniseed_conf}} + -- } use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate', @@ -234,7 +234,7 @@ return packer.startup(function(use) -- } use {'kdheepak/cmp-latex-symbols', after = {'nvim-cmp', 'vimtex'}} -- use {'andersevenrud/compe-tmux', after = 'nvim-cmp', branch = 'cmp'} - use {'PaterJason/cmp-conjure', after = {'conjure', 'nvim-cmp'}} + -- use {'PaterJason/cmp-conjure', after = {'conjure', 'nvim-cmp'}} use { 'windwp/nvim-autopairs', after = 'nvim-cmp', @@ -363,6 +363,8 @@ return packer.startup(function(use) } -- use { -- 'gelguy/wilder.nvim', + -- wants = 'cpsm', + -- requires = {{'nixprime/cpsm', opt = true}}, -- run = ':UpdateRemotePlugins', -- event = 'CmdlineEnter', -- config = tools.wilder_conf