From 0c25fa3f8374d18ac29e5f253ba6e1427aeb21c5 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Tue, 11 Jan 2022 17:59:01 +0100
Subject: [PATCH 1/2] overlays: add overlay for i3status-rust

---
 flake.nix                          |  4 +++-
 overlays/default.nix               |  3 +++
 overlays/i3status-rust/default.nix | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 overlays/default.nix
 create mode 100644 overlays/i3status-rust/default.nix

diff --git a/flake.nix b/flake.nix
index a30b5d8..9bc927c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,6 +60,8 @@
       };
     };
 
+    overlays = import ./overlays;
+
     nixosConfigurations =
       let
         system = "x86_64-linux";
@@ -73,7 +75,7 @@
               config.allowUnfree = true;
             };
           })
-        ];
+        ] ++ builtins.attrValues self.overlays;
         sharedModules = [
           home-manager.nixosModule
           { nixpkgs.overlays = shared_overlays; }
diff --git a/overlays/default.nix b/overlays/default.nix
new file mode 100644
index 0000000..1f747a6
--- /dev/null
+++ b/overlays/default.nix
@@ -0,0 +1,3 @@
+{
+  i3status-rust = import ./i3status-rust;
+}
diff --git a/overlays/i3status-rust/default.nix b/overlays/i3status-rust/default.nix
new file mode 100644
index 0000000..1b78021
--- /dev/null
+++ b/overlays/i3status-rust/default.nix
@@ -0,0 +1,19 @@
+final: prev:
+{
+  # overlay created because nixpkgs's `i3status-rust` depended on `notmuch`, and
+  # `notmuch`'s tests were briefly broken. the features I'm disabling, I don't
+  # need anyway: (at the time of writing)
+  #
+  # - notmuch
+  # - maildir
+  i3status-rust = prev.i3status-rust.overrideAttrs (oldAttrs: {
+    buildInputs = builtins.attrValues {
+      inherit (final)
+        dbus
+        openssl
+        pulseaudio
+      ;
+    };
+    cargoBuildFeatures = [ "pulseaudio" ];
+  });
+}

From c74103f1055d62dc46d0e473922bc0c74f449284 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Tue, 11 Jan 2022 17:59:22 +0100
Subject: [PATCH 2/2] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file changes:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/f3c435a5e5cfa3ce1b2f50ba37b9cacfec4139d9' (2022-01-02)
  → 'github:nix-community/emacs-overlay/57378ea2f62e9f450f420dc9d01cc06e0d3dd15e' (2022-01-11)
• Updated input 'home-manager':
    'github:nix-community/home-manager/8e7a10602d1eb1d242c9d3f9b822203d5751a8c6' (2022-01-02)
  → 'github:nix-community/home-manager/5209ea0d8c77399ec4987590e9738953f15f8d80' (2022-01-11)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/59bfda72480496f32787cec8c557182738b1bd3f' (2021-12-31)
  → 'github:NixOS/nixpkgs/0ecf7d414811f831060cf55707c374d54fbb1dec' (2022-01-09)
• Updated input 'nixpkgs-unstable-small':
    'github:NixOS/nixpkgs/c1d8e77ac2ca4248886632c597debea233700b2b' (2022-01-02)
  → 'github:NixOS/nixpkgs/3fe528dec572a26404f130893d2c22a35646247c' (2022-01-11)
---
 flake.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7f78079..778ccad 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1641149178,
-        "narHash": "sha256-Mt+oT5YZ6G9zHctDKV5pY+3vIdsMmAg0HMvz6rxsIc0=",
+        "lastModified": 1641901534,
+        "narHash": "sha256-Nvm6Zj80fVtzmGsUFYlz9XGFyLnyAe9VoduPmDBu+js=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "f3c435a5e5cfa3ce1b2f50ba37b9cacfec4139d9",
+        "rev": "57378ea2f62e9f450f420dc9d01cc06e0d3dd15e",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1641121012,
-        "narHash": "sha256-svaOMxNMQgFHjcxdmLojOxTxfqSENtnO+S3kb+npIwY=",
+        "lastModified": 1641915897,
+        "narHash": "sha256-C5Vw7B8BKA/kr9tWVYjEdD3AjstXFqoxkkzrOwfQZxk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8e7a10602d1eb1d242c9d3f9b822203d5751a8c6",
+        "rev": "5209ea0d8c77399ec4987590e9738953f15f8d80",
         "type": "github"
       },
       "original": {
@@ -71,11 +71,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1640959792,
-        "narHash": "sha256-zYSR//06FU2TDOpKKj0Hkff6unsxk3NwwNFuB1loU6E=",
+        "lastModified": 1641710811,
+        "narHash": "sha256-yVJ+CtwWZY8BnkNIJ/ue5a28yrRM6CkDF1LvmGmqqwM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "59bfda72480496f32787cec8c557182738b1bd3f",
+        "rev": "0ecf7d414811f831060cf55707c374d54fbb1dec",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
     },
     "nixpkgs-unstable-small": {
       "locked": {
-        "lastModified": 1641125298,
-        "narHash": "sha256-oNIG2UsyMk/osOmnjxHp53d8nJMudpW5a2+dcgsJzmE=",
+        "lastModified": 1641865627,
+        "narHash": "sha256-B3b7KCThCx5bcDtWCX9ZZIl/EVs/lB8iDdI277/tvNA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c1d8e77ac2ca4248886632c597debea233700b2b",
+        "rev": "3fe528dec572a26404f130893d2c22a35646247c",
         "type": "github"
       },
       "original": {