Extreme cleaup + new nix rice + commit hooks
This commit is contained in:
parent
bc28d964d3
commit
c9eeeb9dc4
59 changed files with 319 additions and 400 deletions
|
|
@ -1,7 +1,5 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
kak = "${pkgs.kakoune}/bin/kak";
|
||||
meld = "${pkgs.meld}/bin/meld";
|
||||
shellAliases = {
|
||||
"g" = "git";
|
||||
"ga" = "git add";
|
||||
|
|
@ -101,9 +99,9 @@ in
|
|||
commit.gpgSign = true;
|
||||
# core.editor = kak;
|
||||
credential.helper = "cache --timeout=3600 ";
|
||||
diff.guitool = meld;
|
||||
diff.guitool = "meld";
|
||||
init.defaultBranch = "main";
|
||||
merge.guitool = meld;
|
||||
merge.guitool = "meld";
|
||||
pull.rebase = true;
|
||||
rebase.autoStash = true;
|
||||
user.signingKey = "berto.f@protonmail.com";
|
||||
|
|
@ -117,5 +115,6 @@ in
|
|||
gh
|
||||
git-secret
|
||||
glab
|
||||
meld
|
||||
];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue