diff --git a/config.yaml b/config.yaml index 1cc708bb..a78fff99 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,3 @@ -actions: - nvim-packer-install: nvim +PackerInstall +qall config: backup: true banner: true @@ -29,8 +27,6 @@ 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: diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 70d65e18..711415bd 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -8,4 +8,3 @@ 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 deleted file mode 100644 index 434819c9..00000000 --- a/home/.config/nvim/lua/pluginconf/telescope.lua +++ /dev/null @@ -1,46 +0,0 @@ -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'); diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7341da1e..7c6baad8 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() { - fd -Ht d + rg --hidden --files --null --sort path "$1" 2>/dev/null | xargs -0 dirname | uniq } _fzf_compgen_path() { - fd -Ht f + rg --files --hidden "$1" 2>/dev/null } # search and install packages with fzf