alejandro-angulo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Misc updates (lockfile, zigbee2mqtt)

Browse source
This commit is contained in:
alejandro-angulo 2025-10-22 17:44:51 -07:00
parent b77e23bdf3
commit b385cf3bee
12 changed files with 175 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

69
modules/home/tools/git/default.nix
View file

@ -36,35 +36,48 @@ in
};
catppuccin.delta.enable = true;
programs.git = {
delta = {
enable = true;
options = {
line-numbers = true;
navigate = true;
};
};
programs.delta = {
enable = true;
userName = cfg.userName;
userEmail = cfg.userEmail;
enableGitIntegration = true;
options = {
line-numbers = true;
navigate = true;
};
};
aliases = {
# Prettier log
lol = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative";
# Find log and grab its hash
lof = ''
!${pkgs.git}/bin/git log --pretty=oneline \
| ${pkgs.fzf}/bin/fzf --scheme history \
| ${pkgs.gawk}/bin/awk '{print $1}'
'';
# Push up a new branch with the same as local
pushup = "push -u origin HEAD";
programs.git = {
enable = true;
settings = {
alias = {
# Prettier log
lol = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative";
# Find log and grab its hash
lof = ''
!${pkgs.git}/bin/git log --pretty=oneline \
| ${pkgs.fzf}/bin/fzf --scheme history \
| ${pkgs.gawk}/bin/awk '{print $1}'
'';
# Push up a new branch with the same as local
pushup = "push -u origin HEAD";
};
user = {
name = cfg.userName;
email = cfg.userEmail;
};
init = {
defaultBranch = "main";
};
pull = {
rebase = true;
};
};
signing = {
key = cfg.signingKey;
signByDefault = mkDefault true;
signByDefault = mkDefault false;
};
ignores = [
@ -83,16 +96,6 @@ in
".envrc"
".direnv"
];
extraConfig = {
init = {
defaultBranch = "main";
};
pull = {
rebase = true;
};
};
};
catppuccin.lazygit.enable = true;