From e7535dfa03e4d5fd3a7334afc4818a22a7fc2c4b Mon Sep 17 00:00:00 2001
From: Philipp Hochkamp <git@phochkamp.de>
Date: Wed, 7 Sep 2022 15:24:43 +0200
Subject: [PATCH] update

---
 flake.lock               | 36 ++++++++++++++++++------------------
 hosts/picard/default.nix |  9 ++++++---
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1be33a6e..53d154f8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -44,11 +44,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1661882940,
-        "narHash": "sha256-4LaVFnV22WrOA0aolqqk9dXrM8crikcrLQt29G18F7M=",
+        "lastModified": 1662478528,
+        "narHash": "sha256-Myjd0HPL5lXri3NXOcJ6gP7IKod2eMweQBKM4uxgEGw=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "80cec5115aae74accc4ccfb9f84306d7863f0632",
+        "rev": "3b69bf3cc26ae19de847bfe54d6ab22d7381a90a",
         "type": "github"
       },
       "original": {
@@ -64,11 +64,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1662434261,
-        "narHash": "sha256-+bf55NhDopbwEU9taYsfzYkyhTYDkaEkClL+eR55drg=",
+        "lastModified": 1662502665,
+        "narHash": "sha256-2Ok8NSGmGP+qLCsDfIsUWyMNqLWt8U4Lcu86KbjgN9s=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "817a33003090677244ad5157d3148911e14372af",
+        "rev": "ae5528c72a1e1afbbcb7be7e813f4b3598f919ed",
         "type": "github"
       },
       "original": {
@@ -100,11 +100,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1662396970,
-        "narHash": "sha256-N1LKxBqKmWSM/YFSROAmhotZVTUt0d6yF3opFc/XcN8=",
+        "lastModified": 1662472236,
+        "narHash": "sha256-epA5KzVUxw9ZV+st2aU4oFfJGyIcYleTpX28wsCQQP4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "583a99f0166e3e5df9539b972091830bb9faf6b8",
+        "rev": "de94878b6b83f7f2cfda9cdff005417a6d7ac82c",
         "type": "github"
       },
       "original": {
@@ -167,11 +167,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1662092548,
-        "narHash": "sha256-nmAbyJ5+DBXcNJ2Rcy/Gx84maqtLdr6xEe82+AXCaY8=",
+        "lastModified": 1662458987,
+        "narHash": "sha256-hcDwRlsXZMp2Er3vQk1JEUZWhBPLVC9vTT4xHvhpcE0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "786633331724f36967853b98d9100b5cfaa4d798",
+        "rev": "504b32caf83986b7e6b9c79c1c13008f83290f19",
         "type": "github"
       },
       "original": {
@@ -197,11 +197,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1662443381,
-        "narHash": "sha256-ZsYmfRM2WupizlS2QgEaWmgtowEm3uVi2wD2CFt8jMI=",
+        "lastModified": 1662556621,
+        "narHash": "sha256-9K/E3k261ksOje0SsSug2AiykuEwu8BaLgHFhTHr3+w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "58db1157a7f184bc0cd2a5a5bf8cd9bc3d524402",
+        "rev": "c66b76594310df647f99a653e98e8e59e842d0c6",
         "type": "github"
       },
       "original": {
@@ -389,11 +389,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1662445645,
-        "narHash": "sha256-g1+vRkxJe5wGxIOJYXO1Lg4C8h9al/tL8vQtZGXEv1A=",
+        "lastModified": 1662554860,
+        "narHash": "sha256-DtEPb4FDkAsb9/hSz1O/uDjd/dZMtn9F5azPBVHX6lE=",
         "owner": "thexyno",
         "repo": "blog",
-        "rev": "047775f2a50ac0a7c6bdb21f2493e699ed44f4cb",
+        "rev": "036cd246ba17c917fa7aca1b33aa40a440406988",
         "type": "github"
       },
       "original": {
diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index ccb56479..13454e2e 100644
--- a/hosts/picard/default.nix
+++ b/hosts/picard/default.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ inputs, config, pkgs, ... }:
+{ inputs, config, pkgs, lib, ... }:
 
 {
   imports =
@@ -108,9 +108,12 @@
     enable = true;
     script = "${pkgs.curl}/bin/curl -fss -m 10 --retry 5 -o /dev/null $(cat ${config.age.secrets.picardResticHealthCheckUrl.path})/fail";
   };
+  nixpkgs.overlays = [
+    (self: super: {
+      zfs = super.zfs.override {enableMail = true;};
+    })
+  ];
   services.xynoblog.enable = true;
-  boot.zfs.package = lib.mkForce (pkgs.zfs.override { enableMail = true; });
-  services.zfs.zed.enableMail = true;
   ragon = {
     cli.enable = true;
     user.enable = true;