From 9520540c34655b49453691cb0f9ad6f4be1fc2e0 Mon Sep 17 00:00:00 2001
From: Uttarayan Mondal <email@uttarayan.me>
Date: Mon, 13 May 2024 13:02:44 +0530
Subject: [PATCH] feat: Use ra-multiplex for vim && use delta for git

---
 common/home.nix |  5 +++++
 flake.lock      |  2 +-
 neovim/nvim.nix | 37 +++++++++++++++++++++++--------------
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/common/home.nix b/common/home.nix
index 205340a0..a0647d2a 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -155,6 +155,11 @@ in {
       extraConfig = {
         color.ui = true;
         core.editor = "nvim";
+        core.pager = "${pkgs.delta}/bin/delta";
+        interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
+        delta.navigate = true;
+        merge.conflictStyle = "diff3";
+        diff.colorMoved = "default";
         push.autoSetupRemote = true;
       };
     };
diff --git a/flake.lock b/flake.lock
index 898cd073..f8ecc9bf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1498,7 +1498,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-YLQSn0JnhwtDyysI+JMi4SPRQjUqmHJTYEnl0FlcxpY=",
+        "narHash": "sha256-IgVjk0l4snGVpLlanIC43+qQx/AKMuVv0JBoCZy7oxA=",
         "path": "./neovim",
         "type": "path"
       },
diff --git a/neovim/nvim.nix b/neovim/nvim.nix
index 20fe7e04..714d53ff 100644
--- a/neovim/nvim.nix
+++ b/neovim/nvim.nix
@@ -121,20 +121,20 @@ in rec {
 
       telescope = {
         enable = true;
-        settings = {
-          defaults = {
-            layout_strategy = "vertical";
-            layout_config = {
-              preview_height = 0.8;
-              vertical = {
-                size = {
-                  width = "99%";
-                  height = "99%";
-                };
-              };
-            };
-          };
-        };
+        # settings = {
+        #   defaults = {
+        #     layout_strategy = "vertical";
+        #     layout_config = {
+        #       preview_height = 0.8;
+        #       vertical = {
+        #         size = {
+        #           width = "99%";
+        #           height = "99%";
+        #         };
+        #       };
+        #     };
+        #   };
+        # };
         extensions = {
           undo.enable = true;
           ui-select.enable = true;
@@ -195,6 +195,15 @@ in rec {
                   })
               end
             '';
+          cmd =
+            /*
+            lua
+            */
+            ''
+              function()
+                return { '${pkgs.ra-multiplex}/bin/ra-multiplex', 'client' }
+              end
+            '';
         };
         dap = {
           autoloadConfigurations = false;