Compare commits

...

3 commits

Author SHA1 Message Date
4f88bbff96
home-manager manager lazygit 2026-03-03 12:48:35 +10:00
202c801e72
add delta diff viewer for git 2026-03-03 12:48:11 +10:00
fd42da9e67
why tf did hyprland update?? 2026-03-03 12:46:45 +10:00
3 changed files with 108 additions and 61 deletions

4
flake.lock generated
View file

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

View file

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

View file

@ -3,14 +3,19 @@
pkgs, pkgs,
... ...
}: { }: {
programs.git = { home.packages = with pkgs; [
delta # git diff viewer
];
programs = {
git = {
enable = true; enable = true;
lfs.enable = true; lfs.enable = true;
signing = { signing = {
# key = "F68745A836CA0412"; key = "F68745A836CA0412";
# format = "openpgp"; format = "openpgp";
# signByDefault = true; signByDefault = true;
}; };
settings = { settings = {
@ -29,6 +34,16 @@
core.editor = "hx"; core.editor = "hx";
github.user = "cry128"; 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 = { init = {
defaultBranch = "main"; defaultBranch = "main";
}; };
@ -71,4 +86,37 @@
# } # }
]; ];
}; };
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";
}
];
};
};
};
} }