geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

Compare commits

base: geoffrey:36df032ecd409b29f30c1a589d3e44c508e98417
Branches Tags
geoffrey:main
geoffrey:push-yqlvnukzxvnn
geoffrey:mopidy
geoffrey:flakes
geoffrey:bg_nored
geoffrey:nix
geoffrey:prenix
geoffrey:crash2
..
compare: geoffrey:38ff39bc783368ab535fadb4ccb828f1f0958275
Branches Tags
geoffrey:main
geoffrey:push-yqlvnukzxvnn
geoffrey:mopidy
geoffrey:flakes
geoffrey:bg_nored
geoffrey:nix
geoffrey:prenix
geoffrey:crash2

No commits in common. "36df032ecd409b29f30c1a589d3e44c508e98417" and "38ff39bc783368ab535fadb4ccb828f1f0958275" have entirely different histories.
36df032ecd ... 38ff39bc78

1 changed files with 37 additions and 64 deletions
Show stats Expand all files Collapse all files

101
hm/git/default.nix
View file

@ -1,9 +1,6 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, ... }:
let
cfg = config.programs.git;
in
{ {
config = lib.mkIf cfg.enable { config = lib.mkIf config.programs.git.enable {
home.packages = [ home.packages = [
(pkgs.writeShellApplication { (pkgs.writeShellApplication {
name = "git-sync"; name = "git-sync";
@ -29,69 +26,45 @@ in
); );
}) })
]; ];
programs = { programs.git = {
git = { package = pkgs.gitFull;
package = pkgs.gitFull; aliases = {
aliases = { "git" = "!exec git"; # In case I write one too many git
"git" = "!exec git"; # In case I write one too many git };
}; ignores = [
ignores = [ "*.swp"
"*.swp" "*.swo"
"*.swo" "*.ycm_extra_conf.py"
"*.ycm_extra_conf.py" "tags"
"tags" ".mypy_cache"
".mypy_cache" ];
]; delta = {
delta = { enable = true;
enable = true; options = {
options = { line-numbers = true;
line-numbers = true; syntax-theme = "base16";
syntax-theme = "base16";
};
};
# Also tried difftastic, and while I like the default theme it's a bit
# less configurable
lfs.enable = true;
userEmail = lib.mkDefault "geoffrey@frogeye.fr";
userName = lib.mkDefault "Geoffrey Frogeye";
extraConfig = {
core = {
editor = "nvim";
};
push = {
default = "matching";
};
pull = {
ff = "only";
};
} // lib.optionalAttrs config.frogeye.desktop.xorg {
diff.tool = "meld";
difftool.prompt = false;
"difftool \"meld\"".cmd = "${pkgs.meld}/bin/meld \"$LOCAL\" \"$REMOTE\"";
# This escapes quotes, which isn't the case in the original, hoping this isn't an issue.
}; };
}; };
jujutsu = { # Also tried difftastic, and while I like the default theme it's a bit
enable = true; # less configurable
settings = { lfs.enable = true;
git.auto-local-bookmark = true; userEmail = lib.mkDefault "geoffrey@frogeye.fr";
user = { userName = lib.mkDefault "Geoffrey Frogeye";
email = cfg.userEmail; extraConfig = {
name = cfg.userName; core = {
}; editor = "nvim";
ui = {
pager = "delta";
diff.format = "git";
diff-editor = "meld-3";
merge-editor = "meld";
};
signing = {
sign-all = true;
backend = "gpg";
inherit (cfg.signing) key;
backends.gpg.allow-expired-keys = false;
};
}; };
push = {
default = "matching";
};
pull = {
ff = "only";
};
} // lib.optionalAttrs config.frogeye.desktop.xorg {
diff.tool = "meld";
difftool.prompt = false;
"difftool \"meld\"".cmd = "${pkgs.meld}/bin/meld \"$LOCAL\" \"$REMOTE\"";
# This escapes quotes, which isn't the case in the original, hoping this isn't an issue.
}; };
}; };
services = { services = {