diff --git a/git/default.nix b/git/default.nix index ecb8734..2a63730 100644 --- a/git/default.nix +++ b/git/default.nix @@ -24,8 +24,21 @@ signByDefault = true; }; - difftastic = { + delta = { enable = true; + options = { + dark = true; + theme = "Solarized (dark)"; + side-by-side = true; + line-numbers = true; + true-color = "always"; + plus-style = "syntax \"#003800\""; + minus-style = "syntax \"#380000\""; + }; + }; + + difftastic = { + enable = false; background = "light"; display = "side-by-side-show-both"; enableAsDifftool = true; @@ -41,7 +54,6 @@ core = { editor = "nvim"; fsmonitor = true; - pager = "less -FX"; untrackedCache = true; }; diff --git a/horsch/github.nix b/horsch/github.nix index 92c4697..0a94235 100644 --- a/horsch/github.nix +++ b/horsch/github.nix @@ -1,8 +1,15 @@ -{ pkgs, lib, ... }: - { - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "gh-copilot" + pkgs, + lib, + ... +}: { + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "gh-copilot" + ]; + + home.packages = with pkgs; [ + delta ]; programs = { @@ -29,6 +36,7 @@ width = 64; }; }; + pager.diff = "delta"; }; }; };