From bb6a782039c76b2207521a5872ce0635cdce5a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Mon, 5 Aug 2019 09:38:59 +0200
Subject: [PATCH] move krebs packages to different config

---
 configs/default.nix          | 17 +----------------
 configs/packages/default.nix |  6 ++++++
 configs/packages/krebs.nix   | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 configs/packages/default.nix
 create mode 100644 configs/packages/krebs.nix

diff --git a/configs/default.nix b/configs/default.nix
index b73f040..c467d79 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -32,6 +32,7 @@
     <configs/nano.nix>
     <configs/neovim.nix>
     <configs/nixpkgs-unstable.nix>
+    <configs/packages>
     <configs/printing.nix>
     <configs/python.nix>
     <configs/random-background.nix>
@@ -113,16 +114,6 @@
           git-quick-stats = pkgs.callPackage <packages/git-quick-stats.nix> {};
           writeDash = pkgs.writers.writeDash;
           writeDashBin = pkgs.writers.writeDashBin;
-
-          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> {};
-          untilport = pkgs.callPackage <stockholm/krebs/5pkgs/simple/untilport> {};
-          kpaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/kpaste> {};
-          krebspaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/krebspaste> {};
-          bepasty-client-cli = pkgs.callPackage <stockholm/krebs/5pkgs/simple/bepasty-client-cli> {};
         };
       };
     }
@@ -373,12 +364,6 @@
         odyssey
         haskellPackages.mnemosyne
         literature-quote
-        dic
-        yt-next
-        acronym
-        urban
-        kpaste
-        krebspaste
         daybook
         gnupg
         jo
diff --git a/configs/packages/default.nix b/configs/packages/default.nix
new file mode 100644
index 0000000..f73a88e
--- /dev/null
+++ b/configs/packages/default.nix
@@ -0,0 +1,6 @@
+{ config, ... }:
+{
+  imports = [
+    ./krebs.nix
+  ];
+}
diff --git a/configs/packages/krebs.nix b/configs/packages/krebs.nix
new file mode 100644
index 0000000..35266c1
--- /dev/null
+++ b/configs/packages/krebs.nix
@@ -0,0 +1,18 @@
+{ 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> {};
+  untilport = pkgs.callPackage <stockholm/krebs/5pkgs/simple/untilport> {};
+  kpaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/kpaste> {};
+  krebspaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/krebspaste> {};
+  bepasty-client-cli = pkgs.callPackage <stockholm/krebs/5pkgs/simple/bepasty-client-cli> {};
+  irc-announce = pkgs.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> {};
+};
+in {
+  nixpkgs.config.packageOverrides = krebs-packages;
+
+  environment.systemPackages = map (name: pkgs.${name}) (lib.attrNames (krebs-packages pkgs));
+}