diff --git a/bash/.bashrc b/bash/.bashrc index 94897fe..a45756f 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -1,5 +1,3 @@ -# [ -z "$TMUX" ] && tmux a - [ -f ~/iCloud/secrets.sh ] && . ~/iCloud/secrets.sh [ -f /etc/bashrc ] && . /etc/bashrc [ -f /usr/local/etc/profile.d/z.sh ] && . /usr/local/etc/profile.d/z.sh @@ -16,7 +14,11 @@ shopt -s checkwinsize shopt -s no_empty_cmd_completion shopt -s cdspell shopt -s checkhash +shopt -s cmdhist # save multi-line commands in one +export BASH_SILENCE_DEPRECATION_WARNING=1 + +# export RUBY_CONFIGURE_OPTS="--with-openssl-dir=$(brew --prefix openssl@1.1)" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:/usr/local/lib export EDITOR=nvim export LANG=en_US.UTF-8 @@ -109,7 +111,6 @@ fi export PATH="$HOME/.cargo/bin:$PATH" -__git_ps1() { :;} if [ -e ~/.git-prompt.sh ]; then source ~/.git-prompt.sh fi diff --git a/vim/.vimrc b/vim/.vimrc index 0b928b2..84b6f2b 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -3,7 +3,6 @@ " Description: Personal vim configuration - " ======================================================== " -> General " ======================================================== @@ -90,14 +89,10 @@ Plug 'tpope/vim-vinegar' " ======== Experimental ================================= -Plug 'iamcco/markdown-preview.nvim', - \ { 'do': ':call mkdp#util#install()', 'for': 'markdown', 'on': 'MarkdownPreview' } " Plug 'AndrewRadev/switch.vim' " Plug 'zxqfl/tabnine-vim' " Plug 'pechorin/any-jump.vim' -" Plug 'neoclide/coc.nvim', {'branch': 'release'} - call plug#end() @@ -305,6 +300,7 @@ command! -nargs=? -complete=dir AF \ 'source': 'fd --type f --hidden --follow --exclude .git --no-ignore . '.expand() \ }))) +let g:fzf_preview_window = '' let g:fzf_layout = { 'window': { 'width': 0.3, 'height': 0.6, 'border': 'sharp' } } let g:fzf_colors = \ { 'fg': ['fg', 'Normal'],