From fcd9e858f8b8661d3104f3e736ccc6dabf393bf3 Mon Sep 17 00:00:00 2001 From: Mel Date: Sat, 14 Feb 2026 22:20:01 +0100 Subject: Move over deprecated option paths to new paths for 25.11 Signed-off-by: Mel --- modules/home/common.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'modules/home') diff --git a/modules/home/common.nix b/modules/home/common.nix index 0bbb68c..4379a2b 100644 --- a/modules/home/common.nix +++ b/modules/home/common.nix @@ -16,8 +16,6 @@ in programs = { git = { enable = true; - userName = "Mel"; - userEmail = "mel@rnrd.eu"; signing = { key = "D75A C286 ACA7 00B4 D8EC 377D 2082 F8EC 11CC 009B"; signByDefault = true; @@ -27,12 +25,22 @@ in "*~" "[._]*.sw?" ]; - aliases = { - "skip" = "update-index --skip-worktree"; - "unskip" = "update-index --no-skip-worktree"; + + settings = { + user = { + name = "Mel"; + email = "mel@rnrd.eu"; + }; + + alias = { + "skip" = "update-index --skip-worktree"; + "unskip" = "update-index --no-skip-worktree"; + }; + + init.defaultBranch = "main"; + pull.rebase = true; }; - extraConfig.init.defaultBranch = "main"; }; direnv = { -- cgit 1.4.1 y refs log tree commit diff
blob: 0cd41309fa0fa2e2d192e33840fbde7c6fb04e6a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49