From 71e65461cf73a1d83b2b3cd66c633478235a576a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Fri, 8 Oct 2021 22:20:58 +0200
Subject: [PATCH] feat: simplify use of krebs pkgs

---
 configs/default.nix          |  1 +
 configs/packages/default.nix |  9 ++++++++-
 configs/packages/krebs.nix   | 22 ----------------------
 3 files changed, 9 insertions(+), 23 deletions(-)
 delete mode 100644 configs/packages/krebs.nix

diff --git a/configs/default.nix b/configs/default.nix
index ed9a2ef..3223cc9 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -34,6 +34,7 @@ in {
             scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; };
           })
           (import <stockholm/krebs/5pkgs/haskell>)
+          (import <stockholm/krebs/5pkgs/simple>)
           (import <stockholm/submodules/nix-writers/pkgs>)
           (import <stockholm/krebs/5pkgs/override>)
         ];
diff --git a/configs/packages/default.nix b/configs/packages/default.nix
index 3dc3fc0..ce21c80 100644
--- a/configs/packages/default.nix
+++ b/configs/packages/default.nix
@@ -13,7 +13,6 @@ let
 
 in {
   imports = [
-    ./krebs.nix
     ./writing.nix
     ./python.nix
     ./haskell
@@ -187,6 +186,14 @@ in {
 
     nix-index
     scripts.nix-index-update
+
+    #krebs
+    dic
+    cyberlocker-tools
+    untilport
+    kpaste
+    irc-announce
+    git-preview
   ];
 
 }
diff --git a/configs/packages/krebs.nix b/configs/packages/krebs.nix
deleted file mode 100644
index d9cf4fc..0000000
--- a/configs/packages/krebs.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, pkgs, ... }:
-let
-  krebs-packages = pkgs: {
-    dic = pkgs.callPackage <stockholm/krebs/5pkgs/simple/dic> { };
-    yt-next = pkgs.callPackage <stockholm/lass/5pkgs/yt-next> { };
-    acronym = pkgs.callPackage <stockholm/lass/5pkgs/acronym> { };
-    urban = pkgs.callPackage <stockholm/lass/5pkgs/urban> { };
-    mpv-poll = pkgs.callPackage <stockholm/lass/5pkgs/mpv-poll> { };
-    cyberlocker-tools = pkgs.callPackage <stockholm/krebs/5pkgs/simple/cyberlocker-tools> { };
-    untilport = pkgs.callPackage <stockholm/krebs/5pkgs/simple/untilport> { };
-    kpaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/kpaste> { };
-    irc-announce =
-      pkgs.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> { };
-    git-preview =
-      pkgs.callPackage <stockholm/krebs/5pkgs/simple/git-preview> { };
-  };
-in {
-  nixpkgs.config.packageOverrides = krebs-packages;
-
-  environment.systemPackages =
-    map (name: pkgs.${name}) (lib.attrNames (krebs-packages pkgs));
-}