tony/dotfiles
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Vim Usage

Browse Source 
- Switch to use nvim difftool and mergetool
- nvim plugins that make git integration better
- db interface for vim with .env support
This commit is contained in:
Tony Miller 2025-10-16 11:52:07 +10:00
parent a6c89942b8
commit c15d42808d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.config/git/config
View File

@ -52,7 +52,7 @@
[difftool "nvim"] [difftool "nvim"]
cmd = nvim -d \"$LOCAL\" \"$REMOTE\" cmd = nvim -d \"$LOCAL\" \"$REMOTE\"
[mergetool "nvim"] [mergetool "nvim"]
cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"" cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
# }}} # }}}
# {{{ VSCode # {{{ VSCode

5
.config/nvim/init.lua
View File

@ -56,6 +56,11 @@ local plugins = {
-- Git integration -- Git integration
{"git", "gitsigns.nvim", "https://github.com/lewis6991/gitsigns.nvim.git"}, {"git", "gitsigns.nvim", "https://github.com/lewis6991/gitsigns.nvim.git"},
{"git", "vim-fugitive", "https://github.com/tpope/vim-fugitive.git"},
-- Tools
{"db", "vim-dadbod", "https://github.com/tpope/vim-dadbod.git"},
{"env", "dotenv", "https://github.com/tpope/vim-dotenv"},
-- Quality of life -- Quality of life
{"editor", "which-key.nvim", "https://github.com/folke/which-key.nvim.git"}, {"editor", "which-key.nvim", "https://github.com/folke/which-key.nvim.git"},