felschr/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style: format nix files

Browse source
This commit is contained in:
Felix Schröter 2020-09-23 13:19:19 +02:00
parent 22f6f8b323
commit 4d3bda09b9
No known key found for this signature in database
GPG key ID: 910ACB9F6BD26F58
19 changed files with 132 additions and 175 deletions

36
home/git.nix
View file

@ -1,38 +1,30 @@
{ config, pkgs, ... }:
{
imports = [
./modules/git.nix
];
imports = [ ./modules/git.nix ];
programs.git = {
enable = true;
profiles = {
private = {
name = "Felix Tenley";
email = "dev@felschr.com";
name = "Felix Tenley";
email = "dev@felschr.com";
signingKey = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58";
dirs = [ "~/dev/private/" "/etc/nixos" ];
dirs = [ "~/dev/private/" "/etc/nixos" ];
};
work = {
name = "Felix Schröter";
email = "fs@upsquared.com";
name = "Felix Schröter";
email = "fs@upsquared.com";
signingKey = "F28B FB74 4421 7580 5A49 2930 BE85 F0D9 987F A014";
dirs = [ "~/dev/work/" ];
dirs = [ "~/dev/work/" ];
};
};
ignores = [".direnv"];
signing = {
signByDefault = true;
};
ignores = [ ".direnv" ];
signing = { signByDefault = true; };
extraConfig = {
init = {
defaultBranch = "main";
};
pull = {
rebase = true;
};
init = { defaultBranch = "main"; };
pull = { rebase = true; };
rebase = {
autoStash = true;
autoSquash = true;
@ -41,8 +33,10 @@
};
};
aliases = {
mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -";
pr = "!sh -c 'git fetch $1 refs/pull/$2/head:pr/$1 && git checkout pr/$2'";
mr =
"!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -";
pr =
"!sh -c 'git fetch $1 refs/pull/$2/head:pr/$1 && git checkout pr/$2'";
};
};
}