package overlays

configs/default.nix

@@ -70,21 +70,32 @@
       nixpkgs.config = {
         allowUnfree = true;
         packageOverrides = pkgs: {
+          python3Packages = pkgs.python3Packages.override {
+            overrides = new: old: {
+              spotify-cli-linux = new.callPackage <packages/spotify-cli-linux.nix> {};
+              instaloader = new.callPackage <packages/instaloader.nix> {};
+              sncli = new.callPackage <packages/sncli.nix> {};
+            };
+          };
+          haskellPackages = pkgs.haskellPackages.override {
+            overrides = new: old: {
+              quote-db = new.callPackage <packages/quote-db.nix> {};
+              blessings = new.callPackage <packages/blessings.nix> {};
+              scanner = new.callPackage <stockholm/krebs/5pkgs/haskell/scanner.nix> {};
+            };
+          };
+
           autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {};
-          quote-db = pkgs.haskellPackages.callPackage <packages/quote-db.nix> {};
           bvg = pkgs.callPackage <packages/bvg.nix> {};
           daybook = pkgs.callPackage <packages/daybook.nix> {};
           font-size = pkgs.callPackage <packages/font-size.nix> { font = config.niveum.fonts.terminal; };
           genius = pkgs.callPackage <packages/genius.nix> {};
           instaget = pkgs.callPackage <packages/instaget.nix> {};
-          instaloader = pkgs.python3Packages.callPackage <packages/instaloader.nix> {};
           iolanguage = pkgs.callPackage <packages/iolanguage.nix> {};
           literature-quote = pkgs.callPackage <packages/literature-quote.nix> {};
           n = pkgs.callPackage <packages/n.nix> {};
           nix-git = pkgs.callPackage <packages/nix-git.nix> {};
           odyssey = pkgs.callPackage <packages/odyssey.nix> {};
-          sncli = pkgs.python3Packages.callPackage <packages/sncli.nix> {};
-          spotify-cli-linux = pkgs.python3Packages.callPackage <packages/spotify-cli-linux.nix> {};
           wttr = pkgs.callPackage <packages/wttr.nix> {};
 
           dic = pkgs.callPackage <stockholm/krebs/5pkgs/simple/dic> {};
@@ -153,7 +164,7 @@
       ];
     }
     {
-      environment.interactiveShellInit = "export PATH=$PATH:$HOME/.local/bin:$HOME/.cargo/bin";
+      environment.interactiveShellInit = "export PATH=$PATH:$HOME/.cargo/bin";
       environment.shellAliases = {
         clipboard = "${pkgs.xclip}/bin/xclip -se c";
         o = "${pkgs.xdg_utils}/bin/xdg-open";
@@ -251,7 +262,7 @@
         httpie
         whois
         ddgr
-        instaloader
+        python3Packages.instaloader
       ] ++ [ # media
         ffmpeg
         imagemagick
@@ -322,7 +333,7 @@
         pdfgrep
         pdftk
         spotify
-        spotify-cli-linux
+        python3Packages.spotify-cli-linux
         youtubeDL
       ] ++ [ # math
         bc
@@ -332,7 +343,7 @@
         autorenkalender
         font-size
         odyssey
-        # quote-db
+        haskellPackages.quote-db
         literature-quote
         dic
         yt-next

configs/haskell/packages.nix

@@ -1,6 +1,7 @@
 haskellPackages:
 with haskellPackages; [
-  (callPackage <packages/blessings.nix> {})
+  blessings
+  scanner
   HTTP
   HUnit
   MissingH

configs/sncli.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 let secrets = import <dot/secrets.nix>;
 in {
-  environment.systemPackages = [ pkgs.sncli ];
+  environment.systemPackages = [ pkgs.python3Packages.sncli ];
 
   home-manager.users.me = {
     home.file.".snclirc".text = ''

packages/quote-db.nix

@@ -1,11 +1,17 @@
 { mkDerivation, base, bytestring, cassava, hasmin, HaTeX, lucid
 , megaparsec, optparse-applicative, prettyprinter, raw-strings-qq
 , stdenv, text
+, fetchFromGitHub
 }:
 mkDerivation {
   pname = "quote-db";
   version = "0.1.0.0";
-  src = ./.;
+  src = fetchFromGitHub {
+    owner = "kmein";
+    repo = "quote-db";
+    rev = "2a9776293d306cf2777bfd63412d8e30082826d1";
+    sha256 = "18nmi6rds1dfwkrnvdbqzl261szg93b6rbx6in2zmpz8v6k6z5f9";
+  };
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [