From c6a1a421f4754a4b57844425391592bb6c49f94a Mon Sep 17 00:00:00 2001 From: Tine Jozelj Date: Fri, 5 Aug 2022 21:24:50 +0200 Subject: [PATCH] fix(nvim,vim): use seperate plugin directories --- git/gitconfig | 6 ------ nvim/init.vim | 3 +-- vim/vimrc | 2 +- zsh/zshrc | 3 ++- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/git/gitconfig b/git/gitconfig index 9f62a64..5f85042 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -18,11 +18,5 @@ [diff] external = difft -[url "https://mentos1386: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@github.com/Bird-Buddy/terraform"] - insteadOf = https://github.com/Bird-Buddy/terraform - -[url "https://mentos1386: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@github.com/Bird-Buddy/terraform"] - insteadOf = https://github.com/Bird-Buddy/terraform - [pull] ff = only diff --git a/nvim/init.vim b/nvim/init.vim index aa12b76..52b62ce 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -6,7 +6,7 @@ autocmd VimEnter * """"" "--- Plugins -call plug#begin('~/.vim/plugged') +call plug#begin() " General Plug 'ojroques/vim-oscyank' @@ -17,7 +17,6 @@ Plug 'vim-airline/vim-airline' Plug 'sonph/onehalf', { 'rtp': 'vim' } Plug 'Yggdroot/indentLine' " Git -Plug 'tpope/vim-fugitive' Plug 'airblade/vim-gitgutter' " Search/Files Plug 'nvim-lua/plenary.nvim' diff --git a/vim/vimrc b/vim/vimrc index 0a69d10..80bb614 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -11,7 +11,7 @@ autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)')) """"" "--- Plugins -call plug#begin('~/.vim/plugged') +call plug#begin() " General Plug 'ojroques/vim-oscyank' diff --git a/zsh/zshrc b/zsh/zshrc index 9b6fcf7..5b10ae0 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -45,10 +45,11 @@ bindkey -M vicmd "/" history-incremental-search-forward alias gicm="git checkout main && git pull" alias gic="git checkout" +alias difft="difftastic" alias vim="nvim" # PATH -export PATH=$PATH:$HOME/.bin:$HOME/go/bin +export PATH=$PATH:$HOME/.bin:$HOME/go/bin:/snap/bin # ENV export EDITOR=vim