From 83c571cbff6cb46b122bc798f5a0485bbad6bc75 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Thu, 2 Sep 2021 22:13:27 -0700 Subject: [PATCH] Updates --- home.nix | 2 +- programs/git/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home.nix b/home.nix index b434828..7c69417 100644 --- a/home.nix +++ b/home.nix @@ -59,6 +59,7 @@ copy_on_select = true; enabled_layouts = "*"; macos_quit_when_last_window_closed = true; + scrollback_lines = 10000; }; }; @@ -236,7 +237,6 @@ pkgs.pgcli pkgs.prettyping pkgs.procs - pkgs.procs pkgs.ranger pkgs.readline pkgs.ripgrep diff --git a/programs/git/default.nix b/programs/git/default.nix index 4b10a8f..ed38898 100644 --- a/programs/git/default.nix +++ b/programs/git/default.nix @@ -6,6 +6,7 @@ let editor = "nvim"; pager = "diff-so-fancy | less --tabs=4 -RFX"; }; + init.defaultBranch = "main"; merge.tool = "intellij"; mergetool = { cmd = "idea merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"";