From 0dc46effbb333eadbad356ccd9533be33aaa65a7 Mon Sep 17 00:00:00 2001
From: Leonardo Santiago <leonardo.ribeiro.santiago@gmail.com>
Date: Wed, 4 Jun 2025 16:07:18 -0300
Subject: chore: disable lines in pdf mode, add mergigraf and difftastic by
 default

---
 modules/emacs/README.org | 1 +
 modules/home/default.nix | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/emacs/README.org b/modules/emacs/README.org
index 1e41cd4..a8c2572 100644
--- a/modules/emacs/README.org
+++ b/modules/emacs/README.org
@@ -260,6 +260,7 @@ Add support for ansi escape codes in compilation
 #+begin_src emacs-lisp :tangle yes
 (use-package pdf-tools
   :defer t
+  :hook (pdf-view-mode . (lambda () (display-line-numbers-mode -1)))
   :mode ("\\.pdf\\'" . pdf-view-mode)
   :magic ("%PDF" . pdf-view-mode))
 #+end_src
diff --git a/modules/home/default.nix b/modules/home/default.nix
index cfa68c2..bb2c753 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -38,7 +38,7 @@ in {
           git = {
             enable = true;
             lfs.enable = true;
-            diff-so-fancy.enable = true;
+            difftastic.enable = true;
             extraConfig = {
               user = {
                 name = "Leonardo Santiago";
@@ -48,7 +48,14 @@ in {
               color.ui = true;
               gpg.format = "ssh";
               commit.gpgsign = true;
+              "merge \"mergigraf\"" = {
+                name = "mergigraf";
+                driver = "${pkgs.mergiraf}/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L";
+              };
             };
+            attributes = [
+              "* merge=mergigraf"
+            ];
           };
         };
       };
-- 
cgit v1.2.3