jolheiser
/
dotnix
mirror of https://git.jolheiser.com/dotnix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: jolheiser:ec01830ff638d1b4252c23f69de1ebeb7b080d48
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity
..
compare: jolheiser:e5af56dd92ef4712e1adb81daa27f800d9c170e6
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity

No commits in common. "ec01830ff638d1b4252c23f69de1ebeb7b080d48" and "e5af56dd92ef4712e1adb81daa27f800d9c170e6" have entirely different histories.
ec01830ff6 ... e5af56dd92

3 changed files with 37 additions and 62 deletions
Show Stats Expand all files Collapse all files

1
apps/nogui/default.nix
View File

@ -14,7 +14,6 @@
./go.nix ./go.nix
./gpg.nix ./gpg.nix
#./helix.nix #./helix.nix
./jj.nix
./jq.nix ./jq.nix
./lazygit.nix ./lazygit.nix
./nushell.nix ./nushell.nix

78
apps/nogui/git.nix
View File

@ -1,27 +1,18 @@
{ {config, ...}: let
pkgs, key = "0xB853ADA5DA7BBF7A";
config,
...
}: let
insteadOf = prefix: domain: { insteadOf = prefix: domain: {
"https://${domain}/".insteadOf = "${prefix}:"; "https://${domain}/".insteadOf = "${prefix}:";
"git@${domain}:".insteadOf = "ssh:${prefix}:"; "git@${domain}:".insteadOf = "ssh:${prefix}:";
}; };
key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
sshSigning = {
user.signingkey = key;
commit.gpgSign = true;
tag.gpgSign = true;
gpg = {
format = "ssh";
ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "git@jolheiser.com ${key}"}";
};
};
in { in {
programs.git = { programs.git = {
enable = true; enable = true;
userName = "jolheiser"; userName = "jolheiser";
userEmail = "git@jolheiser.com"; userEmail = "john.olheiser@gmail.com";
signing = {
signByDefault = true;
key = key;
};
aliases = { aliases = {
wt = "worktree"; wt = "worktree";
ci = "commit -s -S -m"; ci = "commit -s -S -m";
@ -39,32 +30,37 @@ in {
}; };
lfs.enable = true; lfs.enable = true;
ignores = [".idea/" "result" "node_modules" "ve"]; ignores = [".idea/" "result" "node_modules" "ve"];
extraConfig = extraConfig = {
{ init.defaultBranch = "main";
init.defaultBranch = "main"; merge.conflictstyle = "zdiff3";
merge.conflictstyle = "zdiff3"; diff.colorMoved = "default";
diff.colorMoved = "default"; core.editor = "hx";
core.editor = "hx"; push = {
push = { sutoSetupRemote = true;
sutoSetupRemote = true; default = "current";
default = "current"; gpgSign = "if-asked";
gpgSign = "if-asked"; };
}; rerere.enabled = true;
rerere.enabled = true; pull.rebase = true;
pull.rebase = true; diff.algorithm = "histogram";
diff.algorithm = "histogram"; merge.tool = "hx";
merge.tool = "hx"; url =
url = insteadOf "jo" "git.jolheiser.com"
insteadOf "jo" "git.jolheiser.com" // insteadOf "gh" "github.com"
// insteadOf "gh" "github.com" // insteadOf "jj" "git.jojodev.com"
// insteadOf "jj" "git.jojodev.com" // insteadOf "gt" "gitea.com"
// insteadOf "gt" "gitea.com" // insteadOf "gl" "gitlab.com"
// insteadOf "gl" "gitlab.com" // insteadOf "cb" "codeberg.org";
// insteadOf "cb" "codeberg.org"; };
} delta = {
// sshSigning;
difftastic = {
enable = true; enable = true;
options = {
features = "ctp-mocha";
navigate = true;
light = false;
line-numbers = true;
side-by-side = true;
};
}; };
includes = [ includes = [
{ {

20
apps/nogui/jj.nix
View File

@ -1,20 +0,0 @@
{pkgs, ...}: {
programs.jujutsu = {
enable = true;
settings = {
user = {
name = "jolheiser";
email = "git@jolheiser.com";
};
ui = {
diff.tool = ["${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right"];
editor = "hx";
};
signing = {
sign-all = true;
backend = "ssh";
key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
};
};
};
}