diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig new file mode 100644 index 0000000..25d20f1 --- /dev/null +++ b/dotfiles/.gitconfig @@ -0,0 +1,29 @@ +[user] + email = root@ivnglkv.me + name = Ivan Golikov + +[push] + default = current + +[diff] + external = difft + tool = difftastic + +[difftool] + prompt = false + +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE" + +[pager] + difftool = true + +[credential] + helper = cache --timeout=600 + +[core] + editor = nvim + autocrlf = input + +[init] + defaultBranch = main diff --git a/home.nix b/home.nix index c0f8fb7..e86a0ec 100644 --- a/home.nix +++ b/home.nix @@ -59,6 +59,7 @@ # # the Nix store. Activating the configuration will then make '~/.screenrc' a # # symlink to the Nix store copy. # ".screenrc".source = dotfiles/screenrc; + ".gitconfig".source = dotfiles/.gitconfig; # # You can also set the file content immediately. # ".gradle/gradle.properties".text = ''