Commit 5ee8d55
Changed files (3)
modules
modules/dev/git.nix
@@ -15,6 +15,8 @@
packages = [
pkgs.git
pkgs.git-lfs
+
+ pkgs.delta
];
files.".gitconfig".type = "delete";
@@ -26,10 +28,12 @@
name = user.identity.displayName;
email = user.identity.email;
};
+
init.defaultBranch = "main";
trim.bases = "develop,master,main"; # for git-trim
push.autoSetupRemote = true;
pull.rebase = true;
+
filter.lfs = let
lfsPath =
lib.getExe pkgs.git-lfs;
@@ -51,6 +55,20 @@
]
);
};
+
+ # Delta
+ delta = {
+ diff-so-fancy = true;
+ line-numbers = true;
+ true-color = "always";
+ };
+ interactive.diffFilter = "${lib.getExe pkgs.delta} --color-only";
+ pager = {
+ blame = "${lib.getExe pkgs.delta}";
+ diff = "${lib.getExe pkgs.delta}";
+ log = "${lib.getExe pkgs.delta}";
+ show = "${lib.getExe pkgs.delta}";
+ };
};
};
};
modules/dev/jujutsu.nix
@@ -9,6 +9,7 @@
hjem = {
user,
pkgs,
+ lib,
...
}: {
packages = [
@@ -23,6 +24,10 @@
name = user.identity.displayName;
email = user.identity.email;
};
+ ui = {
+ diff-formatter = ":git";
+ pager = "${lib.getExe pkgs.delta}";
+ };
};
};
};
modules/dev/utils.nix
@@ -35,6 +35,11 @@
# Documents
rumdl # Markdown linter / formatter
+
+ # Misc
+ jq
+ yq-go
+ scooter
];
};
};