diff options
author | Minijackson <minijackson@riseup.net> | 2024-02-18 18:46:53 +0100 |
---|---|---|
committer | Minijackson <minijackson@riseup.net> | 2024-02-18 18:46:53 +0100 |
commit | d9f0830541d33e8a047bbe208a326ad00d4dbe04 (patch) | |
tree | 1dd59b04706f5f7eb34732d7c6562da98b2581ee /common | |
parent | 7625893e70a8566da8fb4b8d0c77d31515e746ab (diff) | |
download | nixos-config-reborn-d9f0830541d33e8a047bbe208a326ad00d4dbe04.tar.gz nixos-config-reborn-d9f0830541d33e8a047bbe208a326ad00d4dbe04.zip |
common/git: format with alejandra
Diffstat (limited to 'common')
-rw-r--r-- | common/commandline/git.nix | 88 |
1 files changed, 43 insertions, 45 deletions
diff --git a/common/commandline/git.nix b/common/commandline/git.nix index 291f5a9..0e04358 100644 --- a/common/commandline/git.nix +++ b/common/commandline/git.nix | |||
@@ -1,8 +1,9 @@ | |||
1 | inputs: | 1 | inputs: { |
2 | 2 | config, | |
3 | { config, pkgs, lib, ... }: | 3 | pkgs, |
4 | 4 | lib, | |
5 | { | 5 | ... |
6 | }: { | ||
6 | environment = { | 7 | environment = { |
7 | systemPackages = with pkgs; [unstable.git-branchless unstable.gitoxide watchman]; | 8 | systemPackages = with pkgs; [unstable.git-branchless unstable.gitoxide watchman]; |
8 | shellAliases.git = "git-branchless wrap --"; | 9 | shellAliases.git = "git-branchless wrap --"; |
@@ -24,63 +25,60 @@ inputs: | |||
24 | key = "minijackson@riseup.net"; | 25 | key = "minijackson@riseup.net"; |
25 | }; | 26 | }; |
26 | 27 | ||
27 | extraConfig = | 28 | extraConfig = let |
28 | let | 29 | deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta"; |
29 | deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta"; | 30 | in { |
30 | in | 31 | init.defaultBranch = "master"; |
31 | { | ||
32 | init.defaultBranch = "master"; | ||
33 | |||
34 | core = { | ||
35 | whitespace = "trailing-space,space-before-tab"; | ||
36 | pager = deltaCommand; | ||
37 | interactive.diffFilter = "${deltaCommand} --color-only"; | ||
38 | untrackedCache = true; | ||
39 | }; | ||
40 | 32 | ||
41 | diff = { | 33 | core = { |
42 | colormoved = "default"; | 34 | whitespace = "trailing-space,space-before-tab"; |
43 | colorMovedWS = "allow-indentation-change"; | 35 | pager = deltaCommand; |
44 | }; | 36 | interactive.diffFilter = "${deltaCommand} --color-only"; |
37 | untrackedCache = true; | ||
38 | }; | ||
45 | 39 | ||
46 | pull.ff = "only"; | 40 | diff = { |
41 | colormoved = "default"; | ||
42 | colorMovedWS = "allow-indentation-change"; | ||
43 | }; | ||
47 | 44 | ||
48 | merge = { tool = "nvimdiff"; }; | 45 | pull.ff = "only"; |
49 | "mergetool \"nvimdiff\"" = { cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\""; }; | ||
50 | 46 | ||
51 | delta = with config.theme.colors; { | 47 | merge = {tool = "nvimdiff";}; |
52 | line-numbers = true; | 48 | "mergetool \"nvimdiff\"" = {cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\"";}; |
53 | navigate = true; | ||
54 | 49 | ||
55 | whitespace-error-style = "reverse green"; | 50 | delta = with config.theme.colors; { |
51 | line-numbers = true; | ||
52 | navigate = true; | ||
56 | 53 | ||
57 | minus-style = "normal red"; | 54 | whitespace-error-style = "reverse green"; |
58 | minus-non-emph-style = "normal red"; | ||
59 | minus-emph-style = "normal brightred"; | ||
60 | minus-empty-line-marker-style = "normal red"; | ||
61 | 55 | ||
62 | plus-style = "reverse green"; | 56 | minus-style = "normal red"; |
63 | plus-non-emph-style = "reverse green"; | 57 | minus-non-emph-style = "normal red"; |
64 | plus-emph-style = "reverse brightgreen"; | 58 | minus-emph-style = "normal brightred"; |
65 | plus-empty-line-marker-style = "reverse green"; | 59 | minus-empty-line-marker-style = "normal red"; |
66 | 60 | ||
67 | line-numbers-minus-style = "brightred"; | 61 | plus-style = "reverse green"; |
68 | line-numbers-zero-style = "brightblack"; | 62 | plus-non-emph-style = "reverse green"; |
69 | line-numbers-plus-style = "brightgreen"; | 63 | plus-emph-style = "reverse brightgreen"; |
64 | plus-empty-line-marker-style = "reverse green"; | ||
70 | 65 | ||
71 | file-style = "bright${dominantName}"; | 66 | line-numbers-minus-style = "brightred"; |
72 | line-numbers-left-style = dominantName; | 67 | line-numbers-zero-style = "brightblack"; |
73 | line-numbers-right-style = dominantName; | 68 | line-numbers-plus-style = "brightgreen"; |
74 | }; | ||
75 | 69 | ||
70 | file-style = "bright${dominantName}"; | ||
71 | line-numbers-left-style = dominantName; | ||
72 | line-numbers-right-style = dominantName; | ||
76 | }; | 73 | }; |
74 | }; | ||
77 | }; | 75 | }; |
78 | }; | 76 | }; |
79 | 77 | ||
80 | # TODO: move common to NixOS' programs.git.config | 78 | # TODO: move common to NixOS' programs.git.config |
81 | home-manager.users.root = { | 79 | home-manager.users.root = { |
80 | # TODO: use `home-manager.sharedModules`? | ||
82 | programs.git = with lib; | 81 | programs.git = with lib; |
83 | # TODO: use `home-manager.sharedModules`? | ||
84 | mkMerge [ | 82 | mkMerge [ |
85 | (mkDefault config.home-manager.users.minijackson.programs.git) | 83 | (mkDefault config.home-manager.users.minijackson.programs.git) |
86 | { | 84 | { |