lytedev/nix
1
0
Fork 1
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

Git config updates and disable wifi powersave for foxtrot

Browse source
This commit is contained in:
Daniel Flanagan 2024-03-01 09:01:14 -06:00
parent d035874f27
commit d3a881b597
2 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
modules/home-manager/git.nix
View file

@ -4,8 +4,8 @@ in {
programs.git = { programs.git = {
enable = true; enable = true;
userEmail = email;
userName = lib.mkDefault "Daniel Flanagan"; userName = lib.mkDefault "Daniel Flanagan";
userEmail = email;
delta = { delta = {
enable = true; enable = true;
@ -16,23 +16,32 @@ in {
enable = true; enable = true;
}; };
signing = { # signing = {
signByDefault = true; # signByDefault = false;
key = email; # key = ~/.ssh/personal-ed25519;
}; # };
aliases = { aliases = {
a = "add -A"; a = "add -A";
ac = "commit -a"; ac = "commit -a";
b = "rev-parse --symbolic-full-name HEAD"; acm = "commit -a -m";
c = "commit"; c = "commit";
cm = "commit -m"; cm = "commit -m";
cnv = "commit --no-verify";
co = "checkout"; co = "checkout";
b = "rev-parse --symbolic-full-name HEAD";
cnv = "commit --no-verify";
cns = "commit --no-gpg-sign";
cnvs = "commit --no-verify --no-gpg-sign";
cnsv = "commit --no-verify --no-gpg-sign";
d = "diff"; d = "diff";
ds = "diff --staged"; ds = "diff --staged";
dt = "difftool"; dt = "difftool";
f = "fetch"; f = "fetch";
fa = "fetch --all";
l = "log --graph --abbrev-commit --decorate --oneline --all"; l = "log --graph --abbrev-commit --decorate --oneline --all";
plainlog = " log --pretty=format:'%h %ad%x09%an%x09%s' --date=short --decorate"; plainlog = " log --pretty=format:'%h %ad%x09%an%x09%s' --date=short --decorate";
ls = "ls-files"; ls = "ls-files";
@ -46,19 +55,28 @@ in {
# TODO: https://blog.scottlowe.org/2023/12/15/conditional-git-configuration/ # TODO: https://blog.scottlowe.org/2023/12/15/conditional-git-configuration/
extraConfig = { extraConfig = {
init = { commit = {
defaultBranch = "main"; verbose = true;
# gpgSign = true;
}; };
tag = {
# gpgSign = true;
sort = "version:refname";
};
# include.path = local.gitconfig
gpg.format = "ssh";
log.date = "local";
init.defaultBranch = "main";
merge.conflictstyle = "zdiff3"; merge.conflictstyle = "zdiff3";
push = { push.autoSetupRemote = true;
autoSetupRemote = true;
};
branch = { branch.autoSetupMerge = true;
autoSetupMerge = true;
};
sendemail = { sendemail = {
smtpserver = "smtp.mailgun.org"; smtpserver = "smtp.mailgun.org";

1
nixos/foxtrot.nix
View file

@ -143,6 +143,7 @@ in {
pkgs.vaapiVdpau pkgs.vaapiVdpau
]; ];
networking.networkmanager.wifi.powersave = false;
hardware.wirelessRegulatoryDatabase = true; hardware.wirelessRegulatoryDatabase = true;
hardware.framework.amd-7040.preventWakeOnAC = true; hardware.framework.amd-7040.preventWakeOnAC = true;