From 904cbdbc76827bbd97e60a36d14cdd7b5c1ea77e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Thu, 24 Sep 2020 11:13:21 +0200
Subject: [PATCH] feat(overlays): deduplicate

---
 configs/default.nix        |  2 ++
 configs/flameshot-once.nix | 18 +-----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/configs/default.nix b/configs/default.nix
index cdc0275..8c6bda2 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -73,6 +73,8 @@ in {
           })
           (import <niveum/overlays/toml.nix>)
           (import <stockholm/krebs/5pkgs/haskell>)
+          (import <stockholm/submodules/nix-writers/pkgs>)
+          (import <stockholm/krebs/5pkgs/override>)
         ];
       };
     }
diff --git a/configs/flameshot-once.nix b/configs/flameshot-once.nix
index 83e4625..d394a8f 100644
--- a/configs/flameshot-once.nix
+++ b/configs/flameshot-once.nix
@@ -1,26 +1,10 @@
 { lib, pkgs, ... }:
 let
-  overrides = self: super: {
-    flameshot-once =
-      self.callPackage <stockholm/krebs/5pkgs/haskell/flameshot-once.nix> { };
-    blessings =
-      self.callPackage <stockholm/krebs/5pkgs/haskell/blessings.nix> { };
-  };
   flameshot-once =
-    pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> { };
+    pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};
 in {
   nixpkgs.overlays = [
-    (import <stockholm/submodules/nix-writers/pkgs>)
-    (import <stockholm/krebs/5pkgs/override>)
     (self: super: {
-      haskell = super.haskell // {
-        packages = lib.mapAttrs (name: value:
-          if lib.hasAttr "override" value then
-            value.override { inherit overrides; }
-          else
-            value) super.haskell.packages;
-      };
-      haskellPackages = super.haskellPackages.override { inherit overrides; };
       xwaitforwindow =
         super.callPackage <stockholm/krebs/5pkgs/simple/xwaitforwindow.nix> { };
     })