Revamp to get lib overlays working. Base16 in console.

This commit is contained in:
kat witch 2021-07-04 23:45:04 +01:00
parent 61289c7253
commit 3903bc1766
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
11 changed files with 85 additions and 76 deletions

View file

@ -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