From d3a881b5979c7d7b207a13f41041bd15fe2abf73 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 1 Mar 2024 09:01:14 -0600 Subject: [PATCH] Git config updates and disable wifi powersave for foxtrot --- modules/home-manager/git.nix | 48 +++++++++++++++++++++++++----------- nixos/foxtrot.nix | 1 + 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix index 0bf69e7..203d2ea 100644 --- a/modules/home-manager/git.nix +++ b/modules/home-manager/git.nix @@ -4,8 +4,8 @@ in { programs.git = { enable = true; - userEmail = email; userName = lib.mkDefault "Daniel Flanagan"; + userEmail = email; delta = { enable = true; @@ -16,23 +16,32 @@ in { enable = true; }; - signing = { - signByDefault = true; - key = email; - }; + # signing = { + # signByDefault = false; + # key = ~/.ssh/personal-ed25519; + # }; aliases = { a = "add -A"; ac = "commit -a"; - b = "rev-parse --symbolic-full-name HEAD"; + acm = "commit -a -m"; c = "commit"; cm = "commit -m"; - cnv = "commit --no-verify"; 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"; ds = "diff --staged"; dt = "difftool"; + f = "fetch"; + fa = "fetch --all"; + l = "log --graph --abbrev-commit --decorate --oneline --all"; plainlog = " log --pretty=format:'%h %ad%x09%an%x09%s' --date=short --decorate"; ls = "ls-files"; @@ -46,19 +55,28 @@ in { # TODO: https://blog.scottlowe.org/2023/12/15/conditional-git-configuration/ extraConfig = { - init = { - defaultBranch = "main"; + commit = { + 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"; - push = { - autoSetupRemote = true; - }; + push.autoSetupRemote = true; - branch = { - autoSetupMerge = true; - }; + branch.autoSetupMerge = true; sendemail = { smtpserver = "smtp.mailgun.org"; diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix index e7d7c1f..f4c9b9b 100644 --- a/nixos/foxtrot.nix +++ b/nixos/foxtrot.nix @@ -143,6 +143,7 @@ in { pkgs.vaapiVdpau ]; + networking.networkmanager.wifi.powersave = false; hardware.wirelessRegulatoryDatabase = true; hardware.framework.amd-7040.preventWakeOnAC = true;