notmuch: disable broken tests

diff --git a/machines/mermet/users.nix b/machines/mermet/users.nix
index b8396f7e4a65c2ca96a36bdf3e22edfb516d34a8..7b5a94781b48dfeddfa53d6a4ca72284158fb099 100644 (file)
--- a/machines/mermet/users.nix
+++ b/machines/mermet/users.nix
@@ -8,10 +8,6 @@ imports = [
   ../../members/julm.nix
 ];
 
-nix.trustedUsers = [
-  users."julm".name
-];
-
 networking.nftables.ruleset = ''
   add rule inet filter fw2net tcp dport {25,465} skuid ${users.julm.name} counter accept comment "SMTP"
   add rule inet filter fw2net tcp dport 43 skuid ${users.julm.name} counter accept comment "Whois"
@@ -25,13 +21,6 @@ users = {
     root = {
       openssh.authorizedKeys.keys = [
         (readFile (inputs.secrets + "/machines/losurdo/ssh/root.ssh-ed25519.pub"))
-      ] ++ users."julm".openssh.authorizedKeys.keys;
-    };
-  };
-  groups = {
-    wheel = {
-      members = [
-        users."julm".name
       ];
     };
   };

diff --git a/members/julm.nix b/members/julm.nix
index 4a5150fc5136a5afd90c7b85cb8631543155c870..a15f9274ee68f6cdf9ff23e4b9bf376bc8591b64 100644 (file)
--- a/members/julm.nix
+++ b/members/julm.nix
@@ -1,6 +1,7 @@
 { inputs, pkgs, lib, config, wireguard, ... }:
 let
   inherit (builtins) readFile;
+  inherit (config.users) users;
   userLib = import ./lib.nix { inherit lib; };
 in
 {
@@ -16,6 +17,14 @@ users.users.julm = {
   uid = 1000;
   #uid = userLib.mkUid "julm";
 };
+nix.trustedUsers = [ users."julm".name ];
+users.users.root = {
+  openssh.authorizedKeys.keys = users."julm".openssh.authorizedKeys.keys;
+};
+users.groups.wheel.members = [ users."julm".name ];
+environment.systemPackages = [
+  pkgs.neomutt # hack until neomutt becomes installable by home-manager again
+];
 /*
 networking.wireguard.interfaces."wg-intra".peers = [
   { allowedIPs = [ "192.168.42.3/32" ];

diff --git a/nixpkgs/overlays.nix b/nixpkgs/overlays.nix
index 2f92b0fc104c36fbd783f5e6e2602d79292536cf..daabbe81d47dcc859d9b5314a9012b8e7aa77b1a 100644 (file)
--- a/nixpkgs/overlays.nix
+++ b/nixpkgs/overlays.nix
@@ -4,5 +4,6 @@ map import
   overlays/public-inbox.nix
   overlays/smartctl-tbw.nix
   overlays/swaplist.nix
+  overlays/notmuch.nix
   #overlays/zerobin.nix
 ]

diff --git a/nixpkgs/patches/notmuch.nix b/nixpkgs/patches/notmuch.nix
new file mode 100644 (file)
index 0000000..abcba08
--- /dev/null
+++ b/nixpkgs/patches/notmuch.nix
@@ -0,0 +1,5 @@
+self: super: {
+  notmuch = super.notmuch.overideAttrs (old: {
+    doCheck = false;
+  });
+}