From 964779db4d62613d48ade8b8695474bdd57271d3 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Tue, 6 Jan 2026 14:17:57 +0100 Subject: update sources: NixOS 25.11 --- home/home-minimal.nix | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'home/home-minimal.nix') 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"; }; }; -- cgit v1.2.3