Revamp to get lib overlays working. Base16 in console.

pkgs/default.nix

@@ -1,10 +1,8 @@
-{ config ? { }, sources, system ? builtins.currentSystem, ... }@args:
+{  sources, system ? builtins.currentSystem, ... }@args:
 
 let
-  pkgs = import sources.nixpkgs { inherit config; };
-  overlay = self: super:
-  rec {
-    dino = super.dino.overrideAttrs ( 
+  overlay = self: super: rec {
+    dino = super.dino.overrideAttrs (
     { patches ? [], ... }: {
       patches = patches ++ [
         ./dino/0001-add-an-option-to-enable-omemo-by-default-in-new-conv.patch
@@ -21,8 +19,6 @@ let
 
       waybar = super.waybar.override { pulseSupport = true; };
 
-      notmuch = super.callPackage ./notmuch { inherit (super) notmuch; };
-
       nur = import sources.nur {
         nurpkgs = self;
         pkgs = self;
@@ -83,6 +79,16 @@ let
 
       } // super.lib.optionalAttrs (builtins.pathExists ../trusted/pkgs)
       (import ../trusted/pkgs { inherit super self; });
-
-in
-  (pkgs.extend (import (sources.nixexprs + "/overlay.nix"))).extend overlay
+    pkgs = import sources.nixpkgs {
+    overlays = [
+      overlay
+      (import (sources.nixexprs + "/overlay.nix"))
+    ];
+    config = {
+      allowUnfree = true;
+      permittedInsecurePackages = [
+        "ffmpeg-2.8.17"
+      ];
+    };
+  };
+in pkgs

pkgs/notmuch/default.nix

@@ -1,24 +0,0 @@
-{ lib, notmuch, coreutils }@args:
-let
-  notmuch = args.notmuch.super or args.notmuch;
-  drv = notmuch.override { withEmacs = false; };
-in
-drv.overrideAttrs (old: {
-  doCheck = false;
-
-  postInstall = ''
-    ${old.postInstall or ""}
-    make -C bindings/ruby exec_prefix=$out \
-      SHELL=$SHELL \
-      $makeFlags ''${makeFlagsArray+"''${makeFlagsArray[@]}"} \
-      $installFlags ''${installFlagsArray+"''${installFlagsArray[@]}"} \
-      install
-    mv $out/lib/ruby/vendor_ruby/* $out/lib/ruby/
-    rmdir $out/lib/ruby/vendor_ruby
-  '';
-
-  meta = old.meta or { } // {
-    broken = old.meta.broken or false || notmuch.stdenv.isDarwin;
-  };
-  passthru = old.passthru or { } // { super = notmuch; };
-})