diff options
Diffstat (limited to 'programs/git.nix')
| -rw-r--r-- | programs/git.nix | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/programs/git.nix b/programs/git.nix index e4b5e0f..9901d2d 100644 --- a/programs/git.nix +++ b/programs/git.nix | |||
| @@ -12,37 +12,38 @@ with theme; | |||
| 12 | userEmail = "[email protected]"; | 12 | userEmail = "[email protected]"; |
| 13 | userName = "Akshay"; | 13 | userName = "Akshay"; |
| 14 | lfs.enable = true; | 14 | lfs.enable = true; |
| 15 | delta = { | 15 | # delta = { |
| 16 | enable = true; | ||
| 17 | options = { | ||
| 18 | features = "decorations labels"; | ||
| 19 | syntax-theme = "none"; | ||
| 20 | zero-style = "8"; | ||
| 21 | navigate = "true"; | ||
| 22 | keep-plus-minus-markers = "true"; | ||
| 23 | decorations = { | ||
| 24 | file-decoration-style = "none"; | ||
| 25 | whitespace-error-style = "22 reverse"; | ||
| 26 | minus-style = "${base08}"; | ||
| 27 | minus-emph-style = "${base08} bold"; | ||
| 28 | plus-style = "${base0B}"; | ||
| 29 | plus-emph-style = "${base0B} bold"; | ||
| 30 | file-style = "7 italic"; | ||
| 31 | hunk-header-style = "7"; | ||
| 32 | hunk-header-decoration-style = "8 ul"; | ||
| 33 | }; | ||
| 34 | labels = { | ||
| 35 | file-modified-label = " MODIFIED "; | ||
| 36 | file-removed-label = " REMOVED "; | ||
| 37 | file-added-label = " ADDED "; | ||
| 38 | file-renamed-label = " RENAMED "; | ||
| 39 | }; | ||
| 40 | }; | ||
| 41 | }; | ||
| 42 | # difftastic = { | ||
| 43 | # enable = true; | 16 | # enable = true; |
| 44 | # background = "dark"; | 17 | # options = { |
| 45 | # display = "inline"; | 18 | # features = "decorations labels"; |
| 19 | # syntax-theme = "none"; | ||
| 20 | # zero-style = "8"; | ||
| 21 | # navigate = "true"; | ||
| 22 | # line-numbers = "true"; | ||
| 23 | # keep-plus-minus-markers = "true"; | ||
| 24 | # line-numbers-zero-style = "8"; | ||
| 25 | # line-numbers-left-style = "8"; | ||
| 26 | # line-numbers-right-style = "8"; | ||
| 27 | # line-numbers-minus-style = "${base08}"; | ||
| 28 | # line-numbers-plus-style = "${base0B}"; | ||
| 29 | # # decorations = { | ||
| 30 | # # file-decoration-style = "none"; | ||
| 31 | # # whitespace-error-style = "22 reverse"; | ||
| 32 | # # minus-style = "${base08}"; | ||
| 33 | # # minus-emph-style = "${base08} bold"; | ||
| 34 | # # plus-style = "${base0B}"; | ||
| 35 | # # plus-emph-style = "${base0B} bold"; | ||
| 36 | # # file-style = "7 bold"; | ||
| 37 | # # hunk-header-style = "7"; | ||
| 38 | # # hunk-header-decoration-style = "8 ul"; | ||
| 39 | # # }; | ||
| 40 | # labels = { | ||
| 41 | # file-modified-label = " MODIFIED "; | ||
| 42 | # file-removed-label = " REMOVED "; | ||
| 43 | # file-added-label = " ADDED "; | ||
| 44 | # file-renamed-label = " RENAMED "; | ||
| 45 | # }; | ||
| 46 | # }; | ||
| 46 | # }; | 47 | # }; |
| 47 | aliases = { | 48 | aliases = { |
| 48 | co = "checkout"; | 49 | co = "checkout"; |
| @@ -67,6 +68,7 @@ with theme; | |||
| 67 | enabled = true; | 68 | enabled = true; |
| 68 | autoUpdate = true; | 69 | autoUpdate = true; |
| 69 | }; | 70 | }; |
| 71 | merge.conflictstyle = "diff3"; | ||
| 70 | }; | 72 | }; |
| 71 | }; | 73 | }; |
| 72 | } | 74 | } |