Merge branch 'hjdivad/tweaks'

hjdivad · Apr 3, 2024 · 2903cf3 · 2903cf3
2 parents e79670d + 5c52356
commit 2903cf3
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/packages/bash/shell.bash b/packages/bash/shell.bash
@@ -149,10 +149,6 @@ function __setup_env {
     export EDITOR='nvim'
     export GIT_EDITOR='nvim'
   fi
-
-  if which difft> /dev/null 2>&1; then
-    export GIT_EXTERNAL_DIFF=difft
-  fi
 }
 
 function __setup_aliases {

diff --git a/packages/git/config.git b/packages/git/config.git
@@ -65,7 +65,9 @@
 
   yuno = check-ignore -nv
 
-  head = show -w --color-words HEAD
+  head = show 
+  ; these options don't make sense when using delta
+  ; head = show -w --color-words HEAD
   head-msg = log --pretty="%s%n%n%b" -n 1
   # show list of all committers, with commit counts + email
   count = shortlog -sne
@@ -101,6 +103,7 @@
 
 [core]
 	editor = /usr/bin/vim
+  pager = delta
 
 [color]
   grep = true
@@ -159,6 +162,27 @@
 [init]
 	defaultBranch = master
 
+[interactive]
+  diffFilter = delta --color-only
+
+[delta]
+  side-by-side = true
+  line-numbers = true
+  features = "tokyonight"
+  true-color = always
+  # https://github.com/folke/tokyonight.nvim/blob/v3.0.1/extras/delta/tokyonight_night.gitconfig
+  minus-style                   = syntax "#37222c"
+  minus-non-emph-style          = syntax "#37222c"
+  minus-emph-style              = syntax "#713137"
+  minus-empty-line-marker-style = syntax "#37222c"
+  line-numbers-minus-style      = "#b2555b"
+  plus-style                    = syntax "#20303b"
+  plus-non-emph-style           = syntax "#20303b"
+  plus-emph-style               = syntax "#2c5a66"
+  plus-empty-line-marker-style  = syntax "#20303b"
+  line-numbers-plus-style       = "#266d6a"
+  line-numbers-zero-style       = "#3b4261"
+
 [blame]
   # Use GitHub's default file for ignoring blame revs
   # see https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view

diff --git a/packages/nvim/config/lua/plugins/editor.lua b/packages/nvim/config/lua/plugins/editor.lua
@@ -11,9 +11,10 @@ return {
       { "<leader>xX", false },
       { "<leader>xL", false },
       { "<leader>xQ", false },
-      { "<leader>cq", "<cmd>TroubleClose<cr>", desc = "Close Diagnostics (Trouble)" },
-      { "<leader>cd", "<cmd>Trouble document_diagnostics<cr>", desc = "Document Diagnostics (Trouble)" },
-      { "<leader>cD", "<cmd>Trouble workspace_diagnostics<cr>", desc = "Workspace Diagnostics (Trouble)" },
+      { "<leader>cq", "<cmd>Trouble diagnostics close<cr>", desc = "Close Diagnostics (Trouble)" },
+      { "<leader>cd", "<cmd>Trouble diagnostics filter.buf=0 focus=true<cr>", desc = "Document Diagnostics (Trouble)" },
+      -- TODO: can we filter these by path?
+      { "<leader>cD", "<cmd>Trouble diagnostics focus=true<cr>", desc = "Workspace Diagnostics (Trouble)" },
     },
   },
   {