diff --git a/home/programs/git.nix b/home/programs/git.nix index 585b4c7..e101065 100644 --- a/home/programs/git.nix +++ b/home/programs/git.nix @@ -52,17 +52,28 @@ # ██████╔╝███████╗███████╗██║ ██║ ██║ # ╚═════╝ ╚══════╝╚══════╝╚═╝ ╚═╝ ╚═╝ - delta = { - enable = true; + # delta = { + # enable = true; + # + # options = { + # navigate = true; + # # TODO: Add to rose-pine-nix + # syntax-theme = "rose-pine"; + # features = "mellow-barbet"; + # true-color = "always"; + # hyperlinks = true; + # }; + # }; - options = { - navigate = true; - # TODO: Add to rose-pine-nix - syntax-theme = "rose-pine"; - features = "mellow-barbet"; - true-color = "always"; - hyperlinks = true; - }; + # ██████╗ ██╗███████╗███████╗████████╗ █████╗ ███████╗████████╗██╗ ██████╗ + # ██╔══██╗██║██╔════╝██╔════╝╚══██╔══╝██╔══██╗██╔════╝╚══██╔══╝██║██╔════╝ + # ██║ ██║██║█████╗ █████╗ ██║ ███████║███████╗ ██║ ██║██║ + # ██║ ██║██║██╔══╝ ██╔══╝ ██║ ██╔══██║╚════██║ ██║ ██║██║ + # ██████╔╝██║██║ ██║ ██║ ██║ ██║███████║ ██║ ██║╚██████╗ + # ╚═════╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝╚══════╝ ╚═╝ ╚═╝ ╚═════╝ + + difftastic = { + enable = true; }; # ██████╗ ██████╗ ███╗ ██╗███████╗██╗ ██████╗ diff --git a/home/programs/lazygit.nix b/home/programs/lazygit.nix index 39a9b6d..eb18270 100644 --- a/home/programs/lazygit.nix +++ b/home/programs/lazygit.nix @@ -1,6 +1,7 @@ { config, lib, ... }: let has-delta = config.programs.git.delta.enable; + has-difftastic = config.programs.git.difftastic.enable; in { programs.lazygit = { @@ -12,6 +13,7 @@ in git.paging = { colorArg = "always"; pager = lib.mkIf has-delta "delta --paging=never --features=arctic-fox"; + externalDiffCommand = lib.mkIf has-difftastic "difft --color=always --display=inline"; }; os.editPreset = "nvim-remote";