Compare commits

..

No commits in common. "4f88bbff96a440df599ba14a3b918b7fbff42d81" and "3dc202430973793267dd4f3a9bf3a903c8f0d1e8" have entirely different histories.

3 changed files with 61 additions and 108 deletions

4
flake.lock generated
View file

@ -71,8 +71,8 @@
]
},
"locked": {
"lastModified": 1772502318,
"narHash": "sha256-7ZnsLuwU2/nDxWriEeccY2LvpJjPDyV13/hSKrdLFZ8=",
"lastModified": 1772461566,
"narHash": "sha256-1Rib48xxOv5unR6KyBRs1wRoyC8MGguBno75fFGGbPs=",
"path": "/home/me/cry/mk/cerulean",
"type": "path"
},

View file

@ -78,6 +78,7 @@
btop
eza
yazi
lazygit
ripgrep
viddy # modern `watch` command
timg # terminal image (sixel) viewer

View file

@ -3,19 +3,14 @@
pkgs,
...
}: {
home.packages = with pkgs; [
delta # git diff viewer
];
programs = {
git = {
programs.git = {
enable = true;
lfs.enable = true;
signing = {
key = "F68745A836CA0412";
format = "openpgp";
signByDefault = true;
# key = "F68745A836CA0412";
# format = "openpgp";
# signByDefault = true;
};
settings = {
@ -34,16 +29,6 @@
core.editor = "hx";
github.user = "cry128";
# delta diff viewer
core.pager = "delta";
interactive.diffFilter = "delta --color-only";
delta = {
navigate = true;
line-numbers = true;
side-by-side = true;
};
merge.conflictStyle = "zdiff3";
init = {
defaultBranch = "main";
};
@ -86,37 +71,4 @@
# }
];
};
lazygit = {
enable = true;
enableFishIntegration = true;
enableZshIntegration = true;
shellWrapperName = "lg";
settings = {
gui = {
useHunkModeInStagingView = false;
skipDiscardChangeWarning = false;
skipStashWarning = true;
animateExplosion = true; # FUCK YEAHHHHHHHHHHHHHHHHHHHHHHHHH
theme = {
lightTheme = false;
activeBorderColor = ["green" "bold"];
inactiveBorderColor = ["white"];
selectedLineBgColor = ["default"];
};
};
git.pagers = [
{
pager = "delta --dark --pager=never";
}
];
};
};
};
}