Merge vim-dotfiles back to main vim

.gitconfig

@@ -69,7 +69,7 @@ change-commits = "!f() { VAR=$1; OLD=$2; NEW=$3; shift 3; git filter-branch --en
 	sync = "!git pull && git push"
 
 	#vim = "!git ls-files | fzf --preview \"bat --style=numbers --color=always --line-range :500 {}\" | xargs -o vim; git status"
-	vim = "!vim -u $HOME/.config/vim/dotfiles/.vimrc -c \"GFiles\""
+	vim = "!vim -c \"GFiles\""
 	v = vim
 
 	i = "!lazygit"

.shell-aliases

@@ -82,7 +82,6 @@ alias gp='git pull --rebase origin'
 export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -g ""'
 
 
-alias vim-dotfiles='vim -u $HOME/.config/vim/dotfiles/.vimrc'
 alias vim-writer='vim -u $HOME/.config/vim/writer/vimrc'
 alias vim-doc=vim-writer
 
@@ -94,7 +93,7 @@ alias dotifles='dotfiles'
 alias .f='dotfiles'
 alias .fp='dotfiles-private'
 
-alias .fe='export GIT_DIR=$HOME/.dotfiles-bare-repo; export GIT_WORK_TREE=$HOME/; vim-dotfiles -c "GFiles"; git status; unset GIT_DIR; unset GIT_WORK_TREE'
+alias .fe='export GIT_DIR=$HOME/.dotfiles-bare-repo; export GIT_WORK_TREE=$HOME/; vim -c "GFiles"; git status; unset GIT_DIR; unset GIT_WORK_TREE'
 
 alias motd="source $HOME/.shell-motd"
 

.vim/basic-config.vim

@@ -38,3 +38,11 @@ syntax enable
 
 set nocompatible
 filetype plugin on
+
+
+
+
+command! -bang -nargs=* GGrep
+  \ call fzf#vim#grep(
+    \   'git grep --line-number -- '.shellescape(<q-args>), 0,
+      \   fzf#vim#with_preview({'dir': systemlist('git rev-parse --show-toplevel')[0]}), <bang>0)

.vim/commands.vim

@@ -6,3 +6,5 @@ function Date()
 	:r! date "+\%Y-\%m-\%d \%H:\%M"
 endfunction
 command Date call Date()
+
+

.vim/keys.vim

@@ -2,9 +2,9 @@
 set backspace=indent,eol,start
 
 let mapleader=","
+nnoremap <Leader>b :<C-u>call gitblame#echo()<CR>
 
 
-nnoremap <Leader>b :<C-u>call gitblame#echo()<CR>
 
 " Map C-Y C-N to Control Space
 " https://vi.stackexchange.com/questions/21457/how-to-remap-autocomplete-on-controln-to-controlspace#answer-21469
@@ -15,3 +15,4 @@ map <s-k> <S-{>
 
 
 map <C-F> :GFiles <CR>
+map <C-G> :GGrep <CR>

.vim/plugin/commands.vim

@@ -0,0 +1,2 @@
+
+command DeleteThisFile :call delete(expand('%')) | bdelete!

.vim/plugins.vim

@@ -6,34 +6,27 @@ autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
 endif
 
 call plug#begin('~/.vim/plugged')
-Plug '/usr/local/opt/fzf'
+Plug 'airblade/vim-gitgutter'
+Plug 'cespare/vim-toml', { 'branch': 'main' }
+Plug 'dense-analysis/ale'
+Plug 'dhruvasagar/vim-table-mode'
+Plug 'ervandew/supertab'
+Plug 'godlygeek/tabular'
+Plug 'honza/writer.vim'
+Plug 'jamessan/vim-gnupg'
 Plug 'junegunn/fzf'
 Plug 'junegunn/fzf.vim'
-Plug 'michal-h21/vim-zettel'
 Plug 'junegunn/goyo.vim'
 Plug 'junegunn/limelight.vim'
-Plug 'honza/writer.vim'
-Plug 'vimwiki/vimwiki'
-Plug 'airblade/vim-gitgutter'
-Plug 'tpope/vim-fugitive'
-Plug 'stsewd/gx-extended.vim'
-Plug 'godlygeek/tabular'
-
-Plug 'dense-analysis/ale'
-Plug 'pedrohdz/vim-yaml-folds'
-
-Plug 'cespare/vim-toml', { 'branch': 'main' }
-
-Plug 'pseewald/vim-anyfold'
-
 Plug 'mcchrish/nnn.vim'
-
+Plug 'michal-h21/vim-zettel'
 Plug 'morhetz/gruvbox'
-
-
-Plug 'ervandew/supertab'
-
-Plug 'dhruvasagar/vim-table-mode'
-
-Plug 'jamessan/vim-gnupg'
+Plug 'pedrohdz/vim-yaml-folds'
+Plug 'prettier/vim-prettier', { 'do': 'yarn install --frozen-lockfile --production' }
+Plug 'pseewald/vim-anyfold'
+Plug 'sbdchd/neoformat'
+Plug 'stsewd/gx-extended.vim'
+Plug 'tpope/vim-fugitive'
+Plug 'vimwiki/vimwiki'
+Plug 'zivyangll/git-blame.vim'
 call plug#end()

.vim/vimrc

@@ -28,8 +28,6 @@ let g:netrw_liststyle = 3
 set maxmempattern=5000
 
 
-autocmd VimEnter * if argc() == 0 | Explore! | endif
-
 source ~/.vim/auto-dark.vim
 source ~/.vim/theme.vim
 source ~/.vim/keys.vim