flake.lock: Update

Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/52ec9ac3b12395ad677e8b62106f0b98c1f8569d' (2024-07-28) → 'github:NixOS/nixpkgs/9f918d616c5321ad374ae6cb5ea89c9e04bf3e58' (2024-07-31) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/12bf09802d77264e441f48e25459c10c93eada2e' (2024-07-29) → 'github:NixOS/nixpkgs/05405724efa137a0b899cce5ab4dde463b4fd30b' (2024-08-01) • Updated input 'nur': 'github:nix-community/NUR/6f645601159190be1c1ecddf14e738d2de45f6b6' (2024-07-31) → 'github:nix-community/NUR/ac1226f223779364c73f1a450654383768dab1b7' (2024-08-03)
kmail/ kde-pim: install via NixOS option instead
2024-08-03 21:42:58 +02:00 · 2024-08-03 21:42:58 +02:00 · 2024-08-03 21:42:58 +02:00 · 2024-08-03 21:42:58 +02:00 · 2024-08-03 21:42:58 +02:00
7 changed files with 42 additions and 40 deletions
--- a/common/default.nix
+++ b/common/default.nix
@ -158,6 +158,13 @@ in
    wayland.enable = true;
  };
  services.desktopManager.plasma6.enable = true;
+  # TODO: move out into a plasma.nix module
+  programs.kde-pim = {
+    enable = true;
+    kmail = true;
+    kontact = true;
+    merkuro = true;
+  };
  # enable wayland for Chromium and Electron
  environment.sessionVariables.NIXOS_OZONE_WL = "1";

--- a/common/packages.nix
+++ b/common/packages.nix
@ -48,8 +48,6 @@
    networkmanager-openconnect
    networkmanager-vpnc
    networkmanager-openvpn
-    # TODO: is this still necessary?
-    kdePackages.akonadi-mime # for KOrganizer
    # for some Flatpak packkages
    accountsservice
  ];
--- 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"
      },
@ -194,11 +194,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1722017959,
-        "narHash": "sha256-vkv3MtjRtJdqeWMLH874ngbC6/5wUYzsdw0pb96ZLRc=",
+        "lastModified": 1722332872,
+        "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,
-        "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
+        "lastModified": 1722421184,
+        "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5ad6a14c6bf098e98800b091668718c336effc95",
+        "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
        "type": "github"
      },
      "original": {
@ -258,11 +258,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1721949857,
-        "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=",
+        "lastModified": 1722519197,
+        "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665",
+        "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b",
        "type": "github"
      },
      "original": {
@ -274,11 +274,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1722069894,
-        "narHash": "sha256-ZA3OVFjy8o4uZlPMjollef+OUyVnoUmFdMLGr5RE8zE=",
+        "lastModified": 1722709906,
+        "narHash": "sha256-I27FkJ3qSsxc5aZSwpYHMqJwLpvQt6eV4MrwGfVjCvM=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "5a048a702c733a917b6cdb760b3db8c20f705557",
+        "rev": "ac1226f223779364c73f1a450654383768dab1b7",
        "type": "github"
      },
      "original": {
--- 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;
+                };
              };
            })
            [
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@ -198,11 +198,6 @@ let
      okular
      gwenview
      yakuake
-      kmail
-      kontact
-      korganizer
-      akonadi-mime # for KOrganizer
-      kaddressbook
      kdeconnect
      dolphin
      spectacle
--- a/home/secrets
+++ b/home/secrets
@ -1 +1 @@
-Subproject commit 72d2478b720fabf69971747641230387d0df7689
+Subproject commit c725f810bb9a43c213fcf964f036dd0c64b6ba04
--- 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;
+            };
          };
        }) [ "~/" ];
    };
Author	SHA1	Message	Date
Trolli Schmittlauch	daa39f6d5e	flake.lock: Update Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/52ec9ac3b12395ad677e8b62106f0b98c1f8569d' (2024-07-28) → 'github:NixOS/nixpkgs/9f918d616c5321ad374ae6cb5ea89c9e04bf3e58' (2024-07-31) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/12bf09802d77264e441f48e25459c10c93eada2e' (2024-07-29) → 'github:NixOS/nixpkgs/05405724efa137a0b899cce5ab4dde463b4fd30b' (2024-08-01) • Updated input 'nur': 'github:nix-community/NUR/6f645601159190be1c1ecddf14e738d2de45f6b6' (2024-07-31) → 'github:nix-community/NUR/ac1226f223779364c73f1a450654383768dab1b7' (2024-08-03)	2024-08-03 21:42:58 +02:00
Trolli Schmittlauch	d2e77b088f	kmail/ kde-pim: install via NixOS option instead Installing the kde-pim sutie is quite complex. Thus, there's a `programs.kde-pim` in NixOS now to keep track of all necessarry packages. Removing the attempted list of necessary packages from explicit NixOS and home packages instead.	2024-08-03 21:42:58 +02:00
Trolli Schmittlauch	4a585cb6aa	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)	2024-08-03 21:42:58 +02:00
Trolli Schmittlauch	ef66502649	kmail: explicitly install some needed dependencies for mail account creation merely a workaround	2024-08-03 21:42:58 +02:00
Trolli Schmittlauch	0f4bf77cbf	git config contacts: bump submodule, adapt to restructuring	2024-08-03 21:42:58 +02:00