aboutsummaryrefslogtreecommitdiffstats
path: root/hm/soispha/conf/git
diff options
context:
space:
mode:
Diffstat (limited to 'hm/soispha/conf/git')
-rw-r--r--hm/soispha/conf/git/default.nix90
-rw-r--r--hm/soispha/conf/git/git_ignore.git4
-rw-r--r--hm/soispha/conf/git/git_template.git66
3 files changed, 160 insertions, 0 deletions
diff --git a/hm/soispha/conf/git/default.nix b/hm/soispha/conf/git/default.nix
new file mode 100644
index 00000000..f99f705c
--- /dev/null
+++ b/hm/soispha/conf/git/default.nix
@@ -0,0 +1,90 @@
+{
+ lib,
+ nixosConfig,
+ ...
+}: let
+ gitIgnoreFile = ./git_ignore.git;
+ gitTemplateFile = ./git_template.git;
+in {
+ programs.git = {
+ enable = true;
+ #package = pkgs.gitAndTools.gitFull; # TODO: for git send-email support
+ aliases = {
+ st = "status";
+ ds = "diff --staged";
+ di = "diff";
+ rs = "restore --staged";
+
+ ## Logging:
+ ls = "log --max-count=10 --color --format=format:'%C(bold red)%h%C(reset) %C(dim bold blue)%s%C(reset) %C(dim white)[%aN] %C(bold red)<%G?>%C(reset)%C(auto)%d%C(reset)'";
+
+ # https://stackoverflow.com/a/61487052
+ lg = "lg1";
+ lg1 = "lg1-specific --all";
+ lg2 = "lg2-specific --all";
+ lg3 = "lg3-specific --all";
+
+ lg1-specific = "log --graph --abbrev-commit --decorate \
+ --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold cyan) [%G?]%C(reset)%C(auto)%d%C(reset)'";
+
+ lg2-specific = "log --graph --abbrev-commit --decorate \
+ --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'";
+
+ lg3-specific = "log --graph --abbrev-commit --decorate \
+ --format=format:'%C(bold blue)%h%C(reset)\
+ - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)\
+ %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)\
+ %C(bold red)(signature: %G? by %GS, trust: %GT)%C(reset)%n\
+ '' %C(white)%s%C(reset)%n''\
+ %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)\
+ %C(bold white)- trailers: %(trailers) %C(reset)'";
+ };
+ extraConfig = {
+ core = {
+ excludesFile = "${gitIgnoreFile}";
+ };
+ init = {
+ defaultBranch = "prime";
+ };
+ user = {
+ email = "soispha@vhack.eu";
+ name = "Soispha";
+ };
+ help = {
+ autocorrect = 5;
+ };
+ push = {
+ gpgSign = "if-asked";
+ };
+ commit = {
+ template = "${gitTemplateFile}";
+ };
+ diff = {
+ colorMoved = "default";
+ };
+ merge = {
+ conflictstyle = "diff3";
+ };
+ };
+ delta = {
+ enable = true;
+ options = {
+ decorations = {
+ commit-decoration-style = "bold yellow box ul";
+ file-decoration-style = "none";
+ file-style = "bold yellow ul";
+ };
+ keep-plus-minus-markers =
+ if nixosConfig.soispha.laptop.enable
+ then true
+ else false;
+ features = "decorations";
+ whitespace-error-style = "22 reverse";
+ };
+ };
+ signing = {
+ key = "9606FC749FCE16360723D4ADA5E94010C3A642AD!";
+ signByDefault = true;
+ };
+ };
+}
diff --git a/hm/soispha/conf/git/git_ignore.git b/hm/soispha/conf/git/git_ignore.git
new file mode 100644
index 00000000..8f29815e
--- /dev/null
+++ b/hm/soispha/conf/git/git_ignore.git
@@ -0,0 +1,4 @@
+# default nvim Session file name
+Session.vim
+
+# vim: ft=gitignore
diff --git a/hm/soispha/conf/git/git_template.git b/hm/soispha/conf/git/git_template.git
new file mode 100644
index 00000000..9621698d
--- /dev/null
+++ b/hm/soispha/conf/git/git_template.git
@@ -0,0 +1,66 @@
+
+# Title: Summary, imperative, start upper case, don't end with a period
+# If applied, this commit will <your Title>
+
+# Body: Explain *what* and *why* (not *how*).
+
+
+# BREAKING CHANGE: <description>
+# Fixes: #
+# Refs: #
+# Co-authored-by: <name> <email>
+
+
+
+# Convention Commits (https://www.conventionalcommits.org/en/v1.0.0/ or https://github.com/angular/angular/blob/85b4941be137a2fcdc664dc870e408dd72ad7de7/CONTRIBUTING.md#commit):
+# Feat: [Features] -> MINOR version bump
+# A new feature
+#
+# Fix: [Bug Fixes] -> PATCH version bump
+# A bug fix
+#
+# append '!' after the type/scope: [Breaking Change] -> MAJOR version bump
+# A breaking API change
+#
+# Docs: [Documentation]
+# Documentation only changes
+#
+# Style: [Styles]
+# Changes that do not affect the meaning of the code
+# (white-space, formatting, missing semi-colons, etc)
+#
+# Refactor: [Code Refactoring]
+# A code change that neither fixes a bug nor adds a feature
+#
+# Perf: [Performance Improvements] -> PATCH version bump
+# A code change that improves performance
+#
+# Test: [Tests]
+# Adding missing tests or correcting existing tests
+#
+# Build: [Builds] -> PATCH version bump
+# Changes that affect the build system or external dependencies
+# (example scopes: gulp, broccoli, npm)
+#
+# Ci: [Continuous Integrations]
+# Changes to our CI configuration files and scripts
+# (example scopes: Travis, Circle, BrowserStack, SauceLabs)
+#
+# Chore: [Chores]
+# Other changes that don't modify src or test files
+#
+# Reverts: [Reverts]
+# Reverts a previous commit
+
+# How to Write a Git Commit Message:
+# [https://chris.beams.io/posts/git-commit/] -> https://cbea.ms/git-commit/
+#
+# 1. Separate subject from body with a blank line
+# 2. Limit the subject line to 50 characters
+# 3. Capitalize the subject line
+# 4. Do not end the subject line with a period
+# 5. Use the imperative mood in the subject line
+# 6. Wrap the body at 72 characters
+# 7. Use the body to explain *what* and *why* vs. *how*
+#
+# vim: ft=gitcommit