diff options
| author | stuebinm | 2026-01-06 14:17:57 +0100 |
|---|---|---|
| committer | stuebinm | 2026-01-06 14:17:57 +0100 |
| commit | 964779db4d62613d48ade8b8695474bdd57271d3 (patch) | |
| tree | 6e45260fefdeed2e491ba66b0644e248f952d9f7 /home/home-minimal.nix | |
| parent | b1822a225f04a9f2a6b7a29f25758569d12f01b4 (diff) | |
update sources: NixOS 25.11
Diffstat (limited to 'home/home-minimal.nix')
| -rw-r--r-- | home/home-minimal.nix | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/home/home-minimal.nix b/home/home-minimal.nix index cfeb2b2..6f872bf 100644 --- a/home/home-minimal.nix +++ b/home/home-minimal.nix @@ -119,16 +119,17 @@ programs.git = { enable = true; - package = pkgs.gitAndTools.gitFull; - userEmail = "stuebinm@disroot.org"; - userName = "stuebinm"; + package = pkgs.gitFull; signing = { # signByDefault = true; key = "0x8FBE8AAD32FA12B7"; }; - extraConfig = { + settings = { + user.email = "stuebinm@disroot.org"; + user.name = "stuebinm"; + log.showSignature = true; init.defaultBranch = "main"; merge.conflictStyle = "zdiff3"; @@ -180,17 +181,18 @@ # diff-so-fancy.enable = true; # difftastic.enable = true; - delta = { - enable = false; - options = { - decorations = { - commit-decoration-style = "bold yellow"; - file-decoration-style = "bold blue"; - file-style = "bold yellow"; - }; - features = "decorations line-numbers navigate"; - whitespace-error-style = "22 reverse"; + }; + + programs.delta = { + enable = false; + options = { + decorations = { + commit-decoration-style = "bold yellow"; + file-decoration-style = "bold blue"; + file-style = "bold yellow"; }; + features = "decorations line-numbers navigate"; + whitespace-error-style = "22 reverse"; }; }; |
