From 9dd2895a3c457260d3bc5cb7850aba763edc4502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Sun, 21 Apr 2019 08:32:31 +0200
Subject: [PATCH] distrobump

---
 configs/default.nix                | 14 +-------------
 configs/distrobump.nix             | 13 +++++++++++++
 systems/catullus/configuration.nix | 18 +-----------------
 3 files changed, 15 insertions(+), 30 deletions(-)
 create mode 100644 configs/distrobump.nix

diff --git a/configs/default.nix b/configs/default.nix
index 501e8f0..ffbd384 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -18,7 +18,6 @@
     <configs/vscode.nix>
     <configs/htop.nix>
     <configs/dunst.nix>
-    # <configs/mopidy.nix>
     <configs/mail.nix>
     <configs/python.nix>
     <configs/haskell.nix>
@@ -46,18 +45,7 @@
     <configs/theming.nix>
     <configs/tmux.nix>
     <configs/themes/owickstrom-dark.nix>
-    {
-      imports = [
-        (import <stockholm/makefu/3modules/bump-distrowatch.nix> {
-          inherit lib config;
-          pkgs = pkgs // {
-            writeDash = pkgs.unstable.writers.writeDash;
-          };
-        })
-      ];
-
-      makefu.distrobump.enable = true;
-    }
+    <configs/distrobump.nix>
     {
       niveum.user = {
         github = "kmein";
diff --git a/configs/distrobump.nix b/configs/distrobump.nix
new file mode 100644
index 0000000..6aa94af
--- /dev/null
+++ b/configs/distrobump.nix
@@ -0,0 +1,13 @@
+{ lib, config, pkgs, ... }:
+{
+  imports = [
+    (import <stockholm/makefu/3modules/bump-distrowatch.nix> {
+      inherit lib config;
+      pkgs = pkgs // {
+        writeDash = pkgs.unstable.writers.writeDash;
+      };
+    })
+  ];
+
+  makefu.distrobump.enable = true;
+}
diff --git a/systems/catullus/configuration.nix b/systems/catullus/configuration.nix
index 5806292..7a3a3b2 100644
--- a/systems/catullus/configuration.nix
+++ b/systems/catullus/configuration.nix
@@ -12,18 +12,7 @@ in {
     <configs/save-space.nix>
     <modules/retiolum.nix>
     <modules/telegram-bot.nix>
-    {
-      imports = [
-        (import <stockholm/makefu/3modules/bump-distrowatch.nix> {
-          inherit lib config;
-          pkgs = pkgs // {
-            writeDash = unstable.writers.writeDash;
-          };
-        })
-      ];
-
-      makefu.distrobump.enable = true;
-    }
+    <configs/distrobump.nix>
     {
       sound.enable = true;
 
@@ -42,11 +31,6 @@ in {
     }
   ];
 
-  nixpkgs.config.packageOverrides = pkgs: {
-    autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {};
-    literature-quote = pkgs.callPackage <packages/literature-quote.nix> {};
-  };
-
   boot.loader.grub.enable = false;
   boot.loader.generic-extlinux-compatible.enable = true;