use broot

3 files changed, 11 insertions, 0 deletions

diff --git a/programs/default.nix b/programs/default.nix
index 70ded22..482c02e 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -48,5 +48,14 @@
     };
     gpg.enable = true;
     info.enable = true;
+    broot = {
+      enable = true;
+      enableBashIntegration = true;
+      settings = {
+          imports = [
+              "native-16.hjson"
+          ];
+      };
+    };
   };
 }
diff --git a/programs/git.nix b/programs/git.nix
index e4b5e0f..69dd409 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -67,6 +67,7 @@ with theme;
         enabled = true;
         autoUpdate = true;
       };
+      merge.conflictstyle = "diff3";
     };
   };
 }
diff --git a/programs/readline.nix b/programs/readline.nix
index 8afdd82..c4d5046 100644
--- a/programs/readline.nix
+++ b/programs/readline.nix
@@ -8,6 +8,7 @@
     enable = true;
     bindings = {
       "\\C-o" = ''"tmux-fzf\n"'';
+      "\\C-b" = ''"br\n"'';
       "\\t" = "menu-complete";
       "\\e[Z" = "menu-complete-backward";
     };