Merge branch 'master' into laptop
This commit is contained in:
commit
70f93ac637
|
@ -3,10 +3,6 @@ return {
|
|||
dependencies = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
'nvim-telescope/telescope-fzy-native.nvim',
|
||||
{
|
||||
'nvim-telescope/telescope-fzf-native.nvim',
|
||||
build = "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build"
|
||||
}
|
||||
},
|
||||
opts = {
|
||||
defaults = {
|
||||
|
@ -87,7 +83,6 @@ return {
|
|||
local telescope = require("telescope")
|
||||
telescope.setup(opts)
|
||||
telescope.load_extension("undo")
|
||||
telescope.load_extension('fzf')
|
||||
telescope.load_extension('fzy_native')
|
||||
end
|
||||
}
|
||||
|
|
17
zsh/.zshrc
17
zsh/.zshrc
|
@ -86,14 +86,26 @@ function zvm_after_init() {
|
|||
if [ -f "/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh" ]; then
|
||||
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||
fi
|
||||
|
||||
# Use FZY instead of FZF for ctrl-t
|
||||
function find_files() {
|
||||
zle -I
|
||||
BUFFER=cd "$(fd -H . ~/Workspace -t d | fzy -l 20)"
|
||||
zle accept-line
|
||||
clear
|
||||
}
|
||||
zle -N find_files
|
||||
bindkey "^T" find_files
|
||||
bindkey -M emacs "^T" find_files
|
||||
bindkey -M vicmd "^T" find_files
|
||||
bindkey -M viins "^T" find_files
|
||||
}
|
||||
|
||||
|
||||
|
||||
zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' 'r:|=*' 'l:|=* r:|=*'
|
||||
zstyle ':completion::complete:*' gain-privileges 1
|
||||
zstyle ':completion:*' rehash true
|
||||
|
||||
|
||||
autoload -Uz compinit
|
||||
compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
|
||||
|
||||
|
@ -178,7 +190,6 @@ fi
|
|||
alias ls="ls --color=auto"
|
||||
alias gdb='gdb -q'
|
||||
alias ll='ls -lhat'
|
||||
alias fzf="fzf-tmux"
|
||||
alias clip="xsel --clipboard"
|
||||
alias compress="tar --use-compress-program=lbzip2 -cvf"
|
||||
alias vim="nvim"
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit f9fd384d8d64022e24c83bb03ba69e415c7fa90e
|
||||
Subproject commit 307bce24d19fa09d971a0d33c39f3c9fda82924e
|
Loading…
Reference in New Issue