Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 4 additions & 176 deletions home/git/default.nix
Original file line number Diff line number Diff line change
@@ -1,178 +1,6 @@
{ pkgs, lib, ... }:
{
programs.git =
let
bash = "${lib.getExe pkgs.bash}";
delta = "${lib.getExe pkgs.delta}";
diff = "${lib.getBin pkgs.diffutils}/bin/diff";
git = "${lib.getExe pkgs.git}";
grep = "${lib.getExe pkgs.gnugrep}";
head = "${lib.getBin pkgs.coreutils-full}/bin/head";
nvim = "${lib.getExe pkgs.neovim}";
sed = "${lib.getExe pkgs.gnused}";
in
{
enable = true;
package = pkgs.gitFull;

ignores = [
"/.idea/"
"*.sublime-project"
"*.sublime-workspace"
"*.swp"
"*~"
".DS_Store"
".tags"
".tags.lock"
".tags.temp"
"/.tmuxinator.yml"
"Session.vim"
];

maintenance.enable = true;

# # To be set by the importer
# signing = {
# format = "openpgp";
# key = "0x49593BD010DE4723";
# signByDefault = true;
# };

settings = [
{
core = {
autocrlf = "input";
editor = "nvim";
pager = delta;
};
}
# # To be set by the importer
# {
# user = {
# name = "Rudolf Tucek";
# email = "tucek.rudolf@gmail.com";
# };
# }
{
alias = {
fork-point = "!${bash} -c '${diff} -u <(${git} rev-list --first-parent \"\${1:-master}\") <(${git} rev-list --first-parent \"\${2:-HEAD}\") | ${sed} -ne \"s/^ //p\" | ${head} -1' -";
lg = "lg1";
lg1 = "log --graph --abbrev-commit --decorate --date=relative --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 yellow)%d%C(reset)' --branches --remotes --tags";
lg2 = "log --graph --abbrev-commit --decorate --date=relative --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 yellow)%d%C(reset)' --all";
patch = "!${git} --no-pager diff --no-color";
permission-reset = "!${git} diff -p -R | ${grep} -E \"^(diff|(old|new) mode)\" | ${git} apply";
};
}
{
commit = {
verbose = true;
cleanup = "scissors";
};
}
{
tag = {
forceSignAnnotated = true;
};
}
{
format = {
coverFromDescription = "auto";
coverLetter = "auto";
signOff = "true";
};
}
{
fetch = {
prune = true;
};
}
{
prune = {
rebase = "merges";
};
}
{
pull = {
rebase = "merges";
};
}
{
push = {
default = "simple";
};
}
{
rebase = {
autoStash = true;
};
}
{
merge = {
autoStash = true;
conflictstyle = "diff3";
ff = false;
log = true;
tool = "nvimdiff";
};
}
{
mergetool = {
prompt = true;
};
}
{
"mergetool \"nvimdiff\"" = {
cmd = "${nvim} -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'";
};
}
{
color = {
ui = true;
};
}
{
diff = {
colorMoved = "default";
renames = "copies";
tool = "nvimdiff";
};
}
{
difftool = {
prompt = true;
};
}
{
"difftool \"nvimdiff\"" = {
cmd = "${nvim} -d $LOCAL $REMOTE -c '$wincmd w' -c 'wincmd L'";
};
}
{
delta = {
color-only = true;
hunk-header-style = "syntax";
line-numbers = true;
minus-style = "syntax \"#3f0001\"";
# side-by-side = true;
syntax-theme = "Monokai Extended";
whitespace-error-style = "normal";
};
}
{
interactive = {
diffFilter = "${delta} --color-only --hunk-header-style raw";
};
}
{
"color \"diff\"" = {
commit = "yellow bold";
frag = "magenta bold";
meta = "11";
new = "green bold";
old = "red bold";
# whitespace = "red reverse";
};
}
];
};
imports = [
./git.nix
./gh.nix
];
}
38 changes: 38 additions & 0 deletions home/git/gh.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
pkgs,
lib,
config,
...
}:
{
home.packages = [
pkgs.gh
];

programs.gh = {
enable = true;

settings =
let
brave = "${lib.getExe pkgs.brave}";
less = "${lib.getExe pkgs.less}";
nvim = "${config.programs.nixvim.build.package}/bin/nvim";
in
{
version = 1;
git_protocol = "ssh";
editor = nvim;
prompt = "enabled";
prefer_editor_prompt = "enabled";
pager = less;
# http_unix_socket = "";
browser = brave;
color_labels = "enabled";
accessible_colors = "disabled";
accessible_prompter = "disabled";
spinner = "enabled";
};

gitCredentialHelper.enable = false;
};
}
161 changes: 161 additions & 0 deletions home/git/git.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
{
pkgs,
lib,
config,
...
}:
{
programs.git =
let
bash = "${lib.getExe pkgs.bash}";
delta = "${lib.getExe pkgs.delta}";
diff = "${lib.getBin pkgs.diffutils}/bin/diff";
git = "${lib.getExe pkgs.git}";
grep = "${lib.getExe pkgs.gnugrep}";
head = "${lib.getBin pkgs.coreutils-full}/bin/head";
nvim = "${config.programs.nixvim.build.package}/bin/nvim";
sed = "${lib.getExe pkgs.gnused}";
in
{
enable = true;
package = pkgs.gitFull;

ignores = [
"/.idea/"
"*.sublime-project"
"*.sublime-workspace"
"*.swp"
"*~"
".DS_Store"
".tags"
".tags.lock"
".tags.temp"
"/.tmuxinator.yml"
"Session.vim"
];

maintenance.enable = true;

# # To be set by the importer
# signing = {
# format = "openpgp";
# key = "0x49593BD010DE4723";
# signByDefault = true;
# };

settings = {
# To be set by the importer
# user = {
# name = "Rudolf Tucek";
# email = "tucek.rudolf@gmail.com";
# };

core = {
autocrlf = "input";
editor = nvim;
pager = delta;
};

alias = {
fork-point = "!${bash} -c '${diff} -u <(${git} rev-list --first-parent \"\${1:-master}\") <(${git} rev-list --first-parent \"\${2:-HEAD}\") | ${sed} -ne \"s/^ //p\" | ${head} -1' -";
lg = "lg1";
lg1 = "log --graph --abbrev-commit --decorate --date=relative --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 yellow)%d%C(reset)' --branches --remotes --tags";
lg2 = "log --graph --abbrev-commit --decorate --date=relative --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 yellow)%d%C(reset)' --all";
patch = "!${git} --no-pager diff --no-color";
permission-reset = "!${git} diff -p -R | ${grep} -E \"^(diff|(old|new) mode)\" | ${git} apply";
};

commit = {
verbose = true;
cleanup = "scissors";
};

tag = {
forceSignAnnotated = true;
};

format = {
coverFromDescription = "auto";
coverLetter = "auto";
signOff = "true";
};

fetch = {
prune = true;
};

prune = {
rebase = "merges";
};

pull = {
rebase = "merges";
};

push = {
default = "simple";
};

rebase = {
autoStash = true;
};

merge = {
autoStash = true;
conflictstyle = "diff3";
ff = false;
log = true;
tool = "nvimdiff";
};

mergetool = {
prompt = true;
};

"mergetool \"nvimdiff\"" = {
cmd = "${nvim} -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'";
};

color = {
ui = true;
};

diff = {
colorMoved = "default";
renames = "copies";
tool = "nvimdiff";
};

difftool = {
prompt = true;
};

"difftool \"nvimdiff\"" = {
cmd = "${nvim} -d $LOCAL $REMOTE -c '$wincmd w' -c 'wincmd L'";
};

delta = {
color-only = true;
hunk-header-style = "syntax";
line-numbers = true;
minus-style = "syntax \"#3f0001\"";
# side-by-side = true;
syntax-theme = "Monokai Extended";
whitespace-error-style = "normal";
};

interactive = {
diffFilter = "${delta} --color-only --hunk-header-style raw";
};

"color \"diff\"" = {
commit = "yellow bold";
frag = "magenta bold";
meta = "11";
new = "green bold";
old = "red bold";
# whitespace = "red reverse";
};
};
};
}
1 change: 0 additions & 1 deletion home/tools/dev.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
{
home.packages = [
# Git tools
pkgs.gh
pkgs.glab

# Common tools
Expand Down
Loading
Loading