flake.lock

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

home/desktop.nix

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

home/secrets

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

home/workmac.nix

@@ -27,9 +27,6 @@ in
     # also TODO: color schemes nix-darwin
   ];
 
-  # pinning theme is necessary until iTerm 3.5, because despite the dark terminal background, bat detects light mode and adapts theme
-  programs.bat.config.theme = "Visual Studio Dark+";
-
   programs.ssh = {
     enable = true;
     # ssh host config
@@ -39,21 +36,23 @@ 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" { inherit lib; };
+      contacts = import "${inputs.mysecrets}/contacts.nix";
     in
     {
       includes =
@@ -61,7 +60,8 @@ in
           {
             condition = "gitdir:~/src/schmittlauch/";
             contents = {
-              inherit (contacts.schmittlauch) name email;
+              user.name = "Trolli Schmittlauch";
+              user.email = contacts.nixosMail;
             };
           }
         ]
@@ -69,7 +69,8 @@ in
         ++ map (dir: {
           condition = "gitdir:${dir}";
           contents = {
-            inherit (contacts.work) name email;
+            user.name = contacts.realName;
+            user.email = contacts.fcioMail;
           };
         }) [ "~/" ];
     };