Merge branch 'hotfix' into 'main'

Fix for vim fzf after the move to manually installing fzf

See merge request sagidayan/linux-config!10
This commit is contained in:
Sagi Dayan 2022-01-19 16:21:35 +00:00
commit 736e2f8eb8
2 changed files with 15 additions and 0 deletions

View file

@ -38,6 +38,20 @@ export EDITOR=vim;
# Shell functions # Shell functions
############################################ ############################################
function gitB() {
if [ -d ./.git ]; then
BRANCH=$(git branch -l | fzf --reverse --header="Select Branch to checkout")
if [ -z ${BRANCH} ]; then
echo Canceled
else
git ck ${BRANCH}
fi
else
echo "[ERROR]: Not in a git repository"
fi;
}
function huh() { function huh() {
CURRENT_DIR=$(echo "${PWD##*/}") CURRENT_DIR=$(echo "${PWD##*/}")
TITLE="${1:=$CURRENT_DIR}" TITLE="${1:=$CURRENT_DIR}"

View file

@ -21,6 +21,7 @@
Plug 'tpope/vim-fugitive' " git wrapper Plug 'tpope/vim-fugitive' " git wrapper
Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } " golang plugin for vim Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } " golang plugin for vim
Plug 'Yggdroot/indentLine' " Indentation LInes Plug 'Yggdroot/indentLine' " Indentation LInes
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } " Install fzf
Plug 'junegunn/fzf.vim' " Fuzzy search Plug 'junegunn/fzf.vim' " Fuzzy search
Plug 'francoiscabrol/ranger.vim' " Ranger <leader>f Plug 'francoiscabrol/ranger.vim' " Ranger <leader>f
Plug 'scrooloose/nerdtree' " NerdTree - File tree (ctr-n) Plug 'scrooloose/nerdtree' " NerdTree - File tree (ctr-n)