flake.lock: Update

Flake lock file updates:

• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/0b4d40f95a68ef0a6785f6b938ac8c1383321dbf' (2024-07-26)
  → 'github:NixOS/nixos-hardware/14c333162ba53c02853add87a0000cbd7aa230c2' (2024-07-30)
• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/5ad6a14c6bf098e98800b091668718c336effc95' (2024-07-25)
  → 'github:NixOS/nixpkgs/52ec9ac3b12395ad677e8b62106f0b98c1f8569d' (2024-07-28)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/a1cc729dcbc31d9b0d11d86dc7436163548a9665' (2024-07-25)
  → 'github:NixOS/nixpkgs/12bf09802d77264e441f48e25459c10c93eada2e' (2024-07-29)
• Updated input 'nur':
    'github:nix-community/NUR/5a048a702c733a917b6cdb760b3db8c20f705557' (2024-07-27)
  → 'github:nix-community/NUR/6f645601159190be1c1ecddf14e738d2de45f6b6' (2024-07-31)

flake.lock

@@ -159,11 +159,11 @@
     "mysecrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1710686355,
+        "lastModified": 1722419972,
-        "narHash": "sha256-YcSywZx6/IMYfNax1Yx0EDLQiKsCn7glYVz1eglhbcM=",
+        "narHash": "sha256-7gKcSKTu7Z6sswIK4QuMHtDbpKMs09b6w7uFjJJyAIA=",
         "ref": "refs/heads/master",
-        "rev": "72d2478b720fabf69971747641230387d0df7689",
+        "rev": "c725f810bb9a43c213fcf964f036dd0c64b6ba04",
-        "revCount": 4,
+        "revCount": 5,
         "type": "git",
         "url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git"
       },
@@ -194,11 +194,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1722017959,
+        "lastModified": 1722332872,
-        "narHash": "sha256-vkv3MtjRtJdqeWMLH874ngbC6/5wUYzsdw0pb96ZLRc=",
+        "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "0b4d40f95a68ef0a6785f6b938ac8c1383321dbf",
+        "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
         "type": "github"
       },
       "original": {
@@ -210,11 +210,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1721924956,
+        "lastModified": 1722185531,
-        "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
+        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5ad6a14c6bf098e98800b091668718c336effc95",
+        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1721949857,
+        "lastModified": 1722221733,
-        "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=",
+        "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665",
+        "rev": "12bf09802d77264e441f48e25459c10c93eada2e",
         "type": "github"
       },
       "original": {
@@ -274,11 +274,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1722069894,
+        "lastModified": 1722450628,
-        "narHash": "sha256-ZA3OVFjy8o4uZlPMjollef+OUyVnoUmFdMLGr5RE8zE=",
+        "narHash": "sha256-El3ogv9x+0NMglw/cavXyWZAgoLzC0PRPyORuQOMbgU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "5a048a702c733a917b6cdb760b3db8c20f705557",
+        "rev": "6f645601159190be1c1ecddf14e738d2de45f6b6",
         "type": "github"
       },
       "original": {

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.name = contacts.personal.name;
-              user.email = contacts.uniMail;
+              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 = {
-                user.email = contacts.mainMail;
+                  inherit (contacts.schmittlauch) email name;
+                };
               };
             })
             [

home/modules/packages.nix

@@ -202,6 +202,8 @@ let
       kontact
       korganizer
       akonadi-mime # for KOrganizer
+      kmail-account-wizard
+      akonadi-import-wizard
       kaddressbook
       kdeconnect
       dolphin

home/secrets

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

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 ["*"] {
+      "fcio-rzob-jump" = lib.hm.dag.entryAfter [ "*" ] { hostname = "vpn-rzob.services.fcio.net"; };
-        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,7 @@ in
           {
             condition = "gitdir:~/src/schmittlauch/";
             contents = {
-              user.name = "Trolli Schmittlauch";
+              inherit (contacts.schmittlauch) name email;
-              user.email = contacts.nixosMail;
             };
           }
         ]
@@ -72,8 +69,7 @@ in
         ++ map (dir: {
           condition = "gitdir:${dir}";
           contents = {
-            user.name = contacts.realName;
+            inherit (contacts.work) name email;
-            user.email = contacts.fcioMail;
           };
         }) [ "~/" ];
     };