Compare commits
3 commits
3dc2024309
...
4f88bbff96
| Author | SHA1 | Date | |
|---|---|---|---|
| 4f88bbff96 | |||
| 202c801e72 | |||
| fd42da9e67 |
3 changed files with 108 additions and 61 deletions
4
flake.lock
generated
4
flake.lock
generated
|
|
@ -71,8 +71,8 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772461566,
|
||||
"narHash": "sha256-1Rib48xxOv5unR6KyBRs1wRoyC8MGguBno75fFGGbPs=",
|
||||
"lastModified": 1772502318,
|
||||
"narHash": "sha256-7ZnsLuwU2/nDxWriEeccY2LvpJjPDyV13/hSKrdLFZ8=",
|
||||
"path": "/home/me/cry/mk/cerulean",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@
|
|||
btop
|
||||
eza
|
||||
yazi
|
||||
lazygit
|
||||
ripgrep
|
||||
viddy # modern `watch` command
|
||||
timg # terminal image (sixel) viewer
|
||||
|
|
|
|||
|
|
@ -3,14 +3,19 @@
|
|||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.git = {
|
||||
home.packages = with pkgs; [
|
||||
delta # git diff viewer
|
||||
];
|
||||
|
||||
programs = {
|
||||
git = {
|
||||
enable = true;
|
||||
lfs.enable = true;
|
||||
|
||||
signing = {
|
||||
# key = "F68745A836CA0412";
|
||||
# format = "openpgp";
|
||||
# signByDefault = true;
|
||||
key = "F68745A836CA0412";
|
||||
format = "openpgp";
|
||||
signByDefault = true;
|
||||
};
|
||||
|
||||
settings = {
|
||||
|
|
@ -29,6 +34,16 @@
|
|||
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";
|
||||
};
|
||||
|
|
@ -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";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue