diff --git a/home/git.nix b/home/git.nix index 42e18e0..c1bd8c1 100644 --- a/home/git.nix +++ b/home/git.nix @@ -1,7 +1,5 @@ { pkgs, config, flake, ... }: { - imports = [ ./git_delta.nix ]; - home.packages = [ pkgs.git-lfs ]; programs.git = { @@ -20,6 +18,15 @@ pu = "push"; }; ignores = [ "*~" "*.swp" ]; + delta = { + enable = true; + options = { + features = "decorations"; + navigate = true; + light = false; + side-by-side = true; + }; + }; extraConfig = { init.defaultBranch = "master"; # https://srid.ca/unwoke core.editor = "nvim"; diff --git a/home/git_delta.nix b/home/git_delta.nix deleted file mode 100644 index 6746427..0000000 --- a/home/git_delta.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, lib, ... }: - -# https://github.com/dandavison/delta#get-started -# https://dandavison.github.io/delta/configuration.html -{ - programs.git.extraConfig = { - core.pager = lib.getExe pkgs.delta; - interactive.diffFilter = "${lib.getExe pkgs.delta} --color-only --features=interactive"; - delta = { - features = "decorations"; - navigate = true; - light = false; - side-by-side = true; - }; - merge.conflictstyle = "diff3"; - diff.colorMoved = "default"; - }; -}