aboutsummaryrefslogtreecommitdiff
path: root/programs
diff options
context:
space:
mode:
Diffstat (limited to 'programs')
-rw-r--r--programs/default.nix9
-rw-r--r--programs/git.nix1
-rw-r--r--programs/readline.nix1
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 @@
48 }; 48 };
49 gpg.enable = true; 49 gpg.enable = true;
50 info.enable = true; 50 info.enable = true;
51 broot = {
52 enable = true;
53 enableBashIntegration = true;
54 settings = {
55 imports = [
56 "native-16.hjson"
57 ];
58 };
59 };
51 }; 60 };
52} 61}
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;
67 enabled = true; 67 enabled = true;
68 autoUpdate = true; 68 autoUpdate = true;
69 }; 69 };
70 merge.conflictstyle = "diff3";
70 }; 71 };
71 }; 72 };
72} 73}
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 @@
8 enable = true; 8 enable = true;
9 bindings = { 9 bindings = {
10 "\\C-o" = ''"tmux-fzf\n"''; 10 "\\C-o" = ''"tmux-fzf\n"'';
11 "\\C-b" = ''"br\n"'';
11 "\\t" = "menu-complete"; 12 "\\t" = "menu-complete";
12 "\\e[Z" = "menu-complete-backward"; 13 "\\e[Z" = "menu-complete-backward";
13 }; 14 };