softinio/nix-config
softinio/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updates

Browse source
This commit is contained in:
Salar Rahmanian 2021-09-02 22:13:27 -07:00
parent 7ab92e2f76
commit 83c571cbff
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home.nix
View file

@ -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

1
programs/git/default.nix
View file

@ -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\"";