mandlm
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: mandlm:b9ab44b13632388c633c540ea7c8b2226ca3ee78
Branches Tags
mandlm:main
..
compare: mandlm:4312ebee8c99bb2b17219e446ffd6025694a0c50
Branches Tags
mandlm:main

No commits in common. "b9ab44b13632388c633c540ea7c8b2226ca3ee78" and "4312ebee8c99bb2b17219e446ffd6025694a0c50" have entirely different histories.
b9ab44b136 ... 4312ebee8c

2 changed files with 23 additions and 42 deletions
Show Stats Expand all files Collapse all files

6
flake.lock
View File

@ -23,11 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1664107978, "lastModified": 1663410121,
"narHash": "sha256-31I9XnIjXkUa62BM1Zr/ylKMf9eVO5PtoX2mGpmB7/U=", "narHash": "sha256-+SN249gXLmawmwTVo3AhydVoVwgi/gbqutJV7YHrj0Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "72783a2d0dbbf030bff1537873dd5b85b3fb332f", "rev": "f21492b413295ab60f538d5e1812ab908e3e3292",
"type": "github" "type": "github"
}, },
"original": { "original": {

59
home-manager/git.nix
View File

@ -5,52 +5,33 @@
git = { git = {
enable = true; enable = true;
extraConfig = { extraConfig = {
user.private.name = "Michael Mandl";
user.private.email = "mandlm@molez.net";
user.private.signingkey = "4AA25D647AA54CC7";
user.swp.name = "Michael Mandl";
user.swp.email = "mandl@vi-bim.de";
user.swp.signingkey = "4E60F44227F611B4";
core.editor = "nvim"; core.editor = "nvim";
fetch.writeCommitGraph = true;
format.pretty = "format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s";
init.defaultBranch = "main";
log.date = "relative";
pull.rebase = true;
rebase.autostash = true;
rerere.enabled = true;
worktree.guessRemote = true;
diff.external = "difft --background light"; diff.external = "difft --background light";
diff.tool = "difftastic"; diff.tool = "difftastic";
diff.ignoreSubmodules = "none";
difftool.difftastic.cmd = "difft --background light \"$LOCAL\" \"$REMOTE\"";
difftool.prompt = false; difftool.prompt = false;
difftool.difftastic.cmd = "difft --background light \"$LOCAL\" \"$REMOTE\"";
fetch.writeCommitGraph = true;
fetch.recurseSubmodules = true;
format.pretty = "format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s";
init.defaultBranch = "main";
log.date = "relative";
merge.tool = "nvim";
mergetool.nvim.cmd = "nvim -f -c \"Gdiffsplit!\" \"$MERGED\"";
mergetool.prompt = false;
pager.difftool = true; pager.difftool = true;
pull.rebase = true; merge.tool = "nvim";
mergetool.prompt = false;
push.recurseSubmodules = "on-demand"; mergetool.nvim.cmd = "nvim -f -c \"Gdiffsplit!\" \"$MERGED\"";
rebase.autostash = true;
rerere.enabled = true;
status.submoduleSummary = true;
submodule.recurse = true;
user.private.email = "mandlm@molez.net";
user.private.name = "Michael Mandl";
user.private.signingkey = "4AA25D647AA54CC7";
user.swp.email = "mandl@vi-bim.de";
user.swp.name = "Michael Mandl";
user.swp.signingkey = "4E60F44227F611B4";
worktree.guessRemote = true;
}; };
aliases = { aliases = {