refactor: diff-so-fancy -> delta

.config/nix/TODO.md

@@ -0,0 +1,6 @@
+# TODO
+
+- delta theme https://dandavison.github.io/delta/custom-themes.html
+- separate repo for dotfiles (remove bare git repo)
+- swap fish pure for starship prompt (https://starship.rs)
+

.config/nix/modules/git.nix

@@ -45,15 +45,28 @@
       core = {
         editor = "nvim";
         excludesfile = "~/.config/git/ignore_global";
-        pager = "diff-so-fancy | less --tabs=4 -RFX";
+        pager = "delta";
       };
       credential.helper = "osxkeychain";
+      delta = {
+        # TODO: nvim support
+        # hyperlinks = true;
+        navigate = true;
+        line-numbers = true;
+        side-by-side = true;
+      };
       github.user = "tmm";
       gpg = {
         format = "ssh";
         ssh.program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign";
       };
       init.defaultBranch = "main";
+      interactive = {
+        diffFilter = "delta --color-only";
+      };
+      merge = {
+        conflictstyle = "zdiff3";
+      };
       pull.rebase = false;
       push = {
         autoSetupRemote = true;

.config/nix/modules/home-manager.nix

@@ -6,7 +6,7 @@
     bat
     btop
     cachix
-    diff-so-fancy
+    delta
     direnv
     dockutil
     elixir

.config/nix/modules/shell.nix

@@ -86,12 +86,10 @@
     shellAbbrs = {
       a = "ambr";
       b = "bun";
-      d = "devenv";
-      e = "edgedb";
+      d = "delta";
       df = "h git";
       g = "git";
       hm = "home-manager";
-      home = "cd ~";
       i = "iex";
       lsd = "eza -d .*";
       m = "mix";

.config/nvim/TODO.md

@@ -2,6 +2,7 @@
 
 ## Issues
 
+- gf in terminal does not focus file (opens in background)
 - snacks notifications not working (noice issue?)
 - syntax groups flash when loading files
 - neotest output does not auto-scroll in edgy
@@ -23,13 +24,9 @@
 - lualine branch supports git worktree
 - add lazyvim news https://www.lazyvim.org/news
 - .files show up in telescope (e.g. `.env`)
-- separate repo for dotfiles (remove bare git repo)
 
 ## Links
 
-- https://www.lazyvim.org
 - https://github.com/folke/dot
 - https://gist.github.com/rsms/fb463396c95ad8d9efa338a8050a01dc
 - https://github.com/ssgabrieldev/tools/blob/d27bd8466dcd7852de02a9733cd698f77158bf28/nvim/lua/plugins/dap.lua#L178
-
-https://github.com/LazyVim/LazyVim/releases

.config/nvim/lua/plugins.lua

@@ -1831,6 +1831,15 @@ return {
         multiwindow = true,
       }
     end,
+    keys = {
+      {
+        "[c",
+        function()
+          require("treesitter-context").go_to_context(vim.v.count1)
+        end,
+        desc = "Jump to context",
+      },
+    },
   },
 
   -- rsms (https://github.com/tmm/rsms)