From d8330ddac3c8bdba97afd106454e8c35ef3c71d3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Aug 2021 12:03:39 +0300 Subject: [PATCH 1/3] Use fd instead of ripgrep in zsh fzf plugin --- home/.config/zsh/03-aliases.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index c0811358..263062bd 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -24,10 +24,10 @@ rip() { # make fzf zsh plugin use ripgrep _fzf_compgen_dir() { - rg --hidden --files --null --sort path "$1" 2>/dev/null | xargs -0 dirname | uniq + fd -Ht d } _fzf_compgen_path() { - rg --files --hidden "$1" 2>/dev/null + fd -Ht f } # search and install packages with fzf From f0d695400b79a165bc22959f97935f383c00c84d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Aug 2021 11:31:18 +0300 Subject: [PATCH 2/3] Add telescope settings --- home/.config/nvim/init.lua | 1 + .../.config/nvim/lua/pluginconf/telescope.lua | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 home/.config/nvim/lua/pluginconf/telescope.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 711415bd..70d65e18 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -8,3 +8,4 @@ require 'pluginconf.airline' require 'pluginconf.completion' require 'pluginconf.lsp' require 'pluginconf.treesitter' +require 'pluginconf.telescope' diff --git a/home/.config/nvim/lua/pluginconf/telescope.lua b/home/.config/nvim/lua/pluginconf/telescope.lua new file mode 100644 index 00000000..434819c9 --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/telescope.lua @@ -0,0 +1,46 @@ +require('telescope').setup { + defaults = { + vimgrep_arguments = { + 'rg', '--hidden', '--color=never', '--no-heading', + '--with-filename', '--line-number', '--column', '--smart-case' + }, + prompt_prefix = "> ", + selection_caret = "> ", + entry_prefix = " ", + initial_mode = "insert", + selection_strategy = "reset", + sorting_strategy = "descending", + layout_strategy = "horizontal", + layout_config = { + horizontal = {mirror = false}, + vertical = {mirror = false} + }, + file_sorter = require'telescope.sorters'.get_fuzzy_file, + file_ignore_patterns = {}, + generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter, + winblend = 0, + border = {}, + borderchars = {'─', '│', '─', '│', '╭', '╮', '╯', '╰'}, + color_devicons = true, + use_less = true, + path_display = {}, + set_env = {['COLORTERM'] = 'truecolor'}, -- default = nil, + file_previewer = require'telescope.previewers'.vim_buffer_cat.new, + grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new, + qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new, + + -- Developer configurations: Not meant for general override + buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker + }, + pickers = {find_files = {find_command = {"fd", "-Ht", "f"}}}, + extensions = { + fzf = { + fuzzy = true, + override_generic_sorter = false, + override_file_sorter = true, + case_mode = "smart_case" + } + } +} + +require('telescope').load_extension('fzf'); From 8603ff03e42f02add70c09f8a8120b56942d140a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Aug 2021 11:31:41 +0300 Subject: [PATCH 3/3] Add packer install action to dotdrop --- config.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config.yaml b/config.yaml index a78fff99..1cc708bb 100644 --- a/config.yaml +++ b/config.yaml @@ -1,3 +1,5 @@ +actions: + nvim-packer-install: nvim +PackerInstall +qall config: backup: true banner: true @@ -27,6 +29,8 @@ dotfiles: dst: ~/.config/nvim/init.lua src: .config/nvim/init.lua d_nvim_lua: + actions: + - nvim-packer-install dst: ~/.config/nvim/lua src: .config/nvim/lua f_user-dirs.dirs: