From 0f4bf77cbf4bdb8f2b6413eeb7c295d1a4a31ad3 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Wed, 31 Jul 2024 12:19:42 +0200
Subject: [PATCH] git config contacts: bump submodule, adapt to restructuring

---
 flake.lock       |  8 ++++----
 home/desktop.nix | 14 ++++++++------
 home/secrets     |  2 +-
 home/workmac.nix | 20 ++++++++++----------
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6ed7b48..8cb5a96 100644
--- a/flake.lock
+++ b/flake.lock
@@ -159,11 +159,11 @@
     "mysecrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1710686355,
-        "narHash": "sha256-YcSywZx6/IMYfNax1Yx0EDLQiKsCn7glYVz1eglhbcM=",
+        "lastModified": 1722419972,
+        "narHash": "sha256-7gKcSKTu7Z6sswIK4QuMHtDbpKMs09b6w7uFjJJyAIA=",
         "ref": "refs/heads/master",
-        "rev": "72d2478b720fabf69971747641230387d0df7689",
-        "revCount": 4,
+        "rev": "c725f810bb9a43c213fcf964f036dd0c64b6ba04",
+        "revCount": 5,
         "type": "git",
         "url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git"
       },
diff --git a/home/desktop.nix b/home/desktop.nix
index 7703508..212debf 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -3,6 +3,7 @@
   inputs,
   config,
   system,
+  lib,
   ...
 }:
 {
@@ -29,7 +30,7 @@
   programs.git =
     let
       # TODO profile specific
-      contacts = import "${inputs.mysecrets}/contacts.nix";
+      contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
     in
     {
       includes =
@@ -37,15 +38,15 @@
           {
             condition = "gitdir:~/Seafile/Studium/";
             contents = {
-              user.name = contacts.realName;
-              user.email = contacts.uniMail;
+              user.name = contacts.personal.name;
+              user.email = contacts.uni.email;
             };
           }
           {
             condition = "gitdir:~/src/nixpkgs/";
             contents = {
               user.name = "Trolli Schmittlauch";
-              user.email = contacts.nixosMail;
+              user.email = contacts.nixOs.email;
             };
           }
         ]
@@ -55,8 +56,9 @@
             (dir: {
               condition = "gitdir:${dir}";
               contents = {
-                user.name = "Trolli Schmittlauch";
-                user.email = contacts.mainMail;
+                user = {
+                  inherit (contacts.schmittlauch) email name;
+                };
               };
             })
             [
diff --git a/home/secrets b/home/secrets
index 72d2478..c725f81 160000
--- a/home/secrets
+++ b/home/secrets
@@ -1 +1 @@
-Subproject commit 72d2478b720fabf69971747641230387d0df7689
+Subproject commit c725f810bb9a43c213fcf964f036dd0c64b6ba04
diff --git a/home/workmac.nix b/home/workmac.nix
index 511ec4c..5aab318 100644
--- a/home/workmac.nix
+++ b/home/workmac.nix
@@ -39,23 +39,21 @@ in
         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";
         user = "os";
       };
-      "fcio-whq-jump" = lib.hm.dag.entryAfter ["*"] {
+      "fcio-whq-jump" = lib.hm.dag.entryAfter [ "*" ] {
         hostname = "vpn-whq.services.fcio.net";
         extraOptions.LogLevel = "Verbose";
       };
-      "fcio-rzob-jump" = lib.hm.dag.entryAfter ["*"] {
-        hostname = "vpn-rzob.services.fcio.net";
-      };
+      "fcio-rzob-jump" = lib.hm.dag.entryAfter [ "*" ] { hostname = "vpn-rzob.services.fcio.net"; };
     };
   };
 
   programs.git =
     let
-      contacts = import "${inputs.mysecrets}/contacts.nix";
+      contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
     in
     {
       includes =
@@ -63,8 +61,9 @@ in
           {
             condition = "gitdir:~/src/schmittlauch/";
             contents = {
-              user.name = "Trolli Schmittlauch";
-              user.email = contacts.nixosMail;
+              user = {
+                inherit (contacts.schmittlauch) name email;
+              };
             };
           }
         ]
@@ -72,8 +71,9 @@ in
         ++ map (dir: {
           condition = "gitdir:${dir}";
           contents = {
-            user.name = contacts.realName;
-            user.email = contacts.fcioMail;
+            user = {
+              inherit (contacts.work) name email;
+            };
           };
         }) [ "~/" ];
     };