Vim Usage

- Switch to use nvim difftool and mergetool
- nvim plugins that make git integration better
- db interface for vim with .env support

.config/Brewfile

@@ -38,7 +38,6 @@ cask "bbedit"
 cask "contexts"
 cask "gnucash"
 cask "hammerspoon"
-cask "iterm2"
 cask "musicbrainz-picard"
 cask "orbstack"
 cask "rectangle"

.config/git/config

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

.config/nvim/init.lua

@@ -56,6 +56,11 @@ local plugins = {
     
     -- Git integration
     {"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
     {"editor", "which-key.nvim", "https://github.com/folke/which-key.nvim.git"},

.hammerspoon/init.lua

@@ -12,7 +12,7 @@ local DEFAULTS = {
 }
 
 local APPS = {
-  browser = {{"Chromium"}, {"Safari"}},
+  browser = {{"Zen"}, {"Chromium"}, {"Safari"}},
   editors = {DEFAULTS["EDITOR"], {"Nova"}, {"Xcode"}, {"Code", "Visual Studio Code", "VSCodium"}, {"IntelliJ IDEA"}},
   chats = {{"Microsoft Teams"}, {"Telegram"}},
   messengers = {{"Messages"}, {"Telegram"}, {"Signal"}},