schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

git config contacts: bump submodule, adapt to restructuring

Browse source
This commit is contained in:
Trolli Schmittlauch 2024-07-31 12:19:42 +02:00
parent 0a4a26f94e
commit 0f4bf77cbf
4 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -159,11 +159,11 @@
"mysecrets": { "mysecrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1710686355, "lastModified": 1722419972,
"narHash": "sha256-YcSywZx6/IMYfNax1Yx0EDLQiKsCn7glYVz1eglhbcM=", "narHash": "sha256-7gKcSKTu7Z6sswIK4QuMHtDbpKMs09b6w7uFjJJyAIA=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "72d2478b720fabf69971747641230387d0df7689", "rev": "c725f810bb9a43c213fcf964f036dd0c64b6ba04",
"revCount": 4, "revCount": 5,
"type": "git", "type": "git",
"url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git" "url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git"
}, },

14
home/desktop.nix
View file

@ -3,6 +3,7 @@
inputs, inputs,
config, config,
system, system,
lib,
... ...
}: }:
{ {
@ -29,7 +30,7 @@
programs.git = programs.git =
let let
# TODO profile specific # TODO profile specific
contacts = import "${inputs.mysecrets}/contacts.nix"; contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
in in
{ {
includes = includes =
@ -37,15 +38,15 @@
{ {
condition = "gitdir:~/Seafile/Studium/"; condition = "gitdir:~/Seafile/Studium/";
contents = { contents = {
user.name = contacts.realName; user.name = contacts.personal.name;
user.email = contacts.uniMail; user.email = contacts.uni.email;
}; };
} }
{ {
condition = "gitdir:~/src/nixpkgs/"; condition = "gitdir:~/src/nixpkgs/";
contents = { contents = {
user.name = "Trolli Schmittlauch"; user.name = "Trolli Schmittlauch";
user.email = contacts.nixosMail; user.email = contacts.nixOs.email;
}; };
} }
] ]
@ -55,8 +56,9 @@
(dir: { (dir: {
condition = "gitdir:${dir}"; condition = "gitdir:${dir}";
contents = { contents = {
user.name = "Trolli Schmittlauch"; user = {
user.email = contacts.mainMail; inherit (contacts.schmittlauch) email name;
};
}; };
}) })
[ [

2
home/secrets

@ -1 +1 @@
Subproject commit 72d2478b720fabf69971747641230387d0df7689 Subproject commit c725f810bb9a43c213fcf964f036dd0c64b6ba04

20
home/workmac.nix
View file

@ -39,23 +39,21 @@ in
extraOptions.IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\""; extraOptions.IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\"";
}; };
"hydra01" = lib.hm.dag.entryAfter ["*"] { "hydra01" = lib.hm.dag.entryAfter [ "*" ] {
hostname = "hydra01.access.whq.gocept.net"; hostname = "hydra01.access.whq.gocept.net";
user = "os"; user = "os";
}; };
"fcio-whq-jump" = lib.hm.dag.entryAfter ["*"] { "fcio-whq-jump" = lib.hm.dag.entryAfter [ "*" ] {
hostname = "vpn-whq.services.fcio.net"; hostname = "vpn-whq.services.fcio.net";
extraOptions.LogLevel = "Verbose"; extraOptions.LogLevel = "Verbose";
}; };
"fcio-rzob-jump" = lib.hm.dag.entryAfter ["*"] { "fcio-rzob-jump" = lib.hm.dag.entryAfter [ "*" ] { hostname = "vpn-rzob.services.fcio.net"; };
hostname = "vpn-rzob.services.fcio.net";
};
}; };
}; };
programs.git = programs.git =
let let
contacts = import "${inputs.mysecrets}/contacts.nix"; contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
in in
{ {
includes = includes =
@ -63,8 +61,9 @@ in
{ {
condition = "gitdir:~/src/schmittlauch/"; condition = "gitdir:~/src/schmittlauch/";
contents = { contents = {
user.name = "Trolli Schmittlauch"; user = {
user.email = contacts.nixosMail; inherit (contacts.schmittlauch) name email;
};
}; };
} }
] ]
@ -72,8 +71,9 @@ in
++ map (dir: { ++ map (dir: {
condition = "gitdir:${dir}"; condition = "gitdir:${dir}";
contents = { contents = {
user.name = contacts.realName; user = {
user.email = contacts.fcioMail; inherit (contacts.work) name email;
};
}; };
}) [ "~/" ]; }) [ "~/" ];
}; };