diff --git a/flake.lock b/flake.lock index 7dcd4d2..a775894 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1778003029, - "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", + "lastModified": 1778430510, + "narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", + "rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575", "type": "github" }, "original": { diff --git a/home/alex/gh.nix b/home/alex/gh.nix index 003b889..47029c4 100644 --- a/home/alex/gh.nix +++ b/home/alex/gh.nix @@ -15,7 +15,7 @@ co = "pr checkout"; }; http_unix_socket = ""; - color_labels = "disabled"; + color_labels = "enabled"; accessible_colors = "disabled"; accessible_prompter = "disabled"; spinner = "enabled"; diff --git a/home/alex/git.nix b/home/alex/git.nix index c706da5..e2ffd9c 100644 --- a/home/alex/git.nix +++ b/home/alex/git.nix @@ -1,6 +1,8 @@ -{ ... }: +{ pkgs, ... }: { + home.packages = [ pkgs.delta ]; + programs.git = { enable = true; settings = { @@ -8,10 +10,31 @@ user.email = "aalexmmaldonado@gmail.com"; init.defaultBranch = "main"; core.editor = "hx"; + core.pager = "delta"; pull.rebase = true; + delta = { + navigate = true; + side-by-side = true; + line-numbers = true; + }; + + interactive.diffFilter = "delta --color-only"; + + merge.conflictstyle = "zdiff3"; + diff.algorithm = "histogram"; + diff.colorMoved = "default"; + + push.autoSetupRemote = true; + push.default = "simple"; + fetch.prune = true; + rerere.enabled = true; + help.autocorrect = "prompt"; + branch.sort = "-committerdate"; + column.ui = "auto"; + + transfer.fsckObjects = true; }; lfs.enable = true; }; } -