fix(packages): move to overlays

configs/default.nix

@@ -86,6 +86,7 @@ in
         overlays = [
           # (import <stockholm/submodules/nix-writers>)
           (import <niveum/overlays/toml.nix>)
+          (import <niveum/overlays/scripts.nix>)
           (self: super: {
             python3Packages = super.python3Packages.override {
               overrides = new: old: {
@@ -94,54 +95,14 @@ in
                 sncli = new.callPackage <niveum/packages/sncli.nix> {};
               };
             };
-            haskellPackages = super.haskellPackages.override {
-              overrides = new: old: {
-                blessings = new.callPackage <niveum/packages/blessings.nix> {};
-                scanner = new.callPackage <stockholm/krebs/5pkgs/haskell/scanner.nix> {};
-              };
-            };
 
             writeDashBin = super.writers.writeDashBin;
             writeDash = super.writers.writeDash;
 
-            git-quick-stats = super.callPackage <niveum/packages/git-quick-stats.nix> {};
             iolanguage = super.callPackage <niveum/packages/iolanguage.nix> {};
             nix-git = super.callPackage <niveum/packages/nix-git.nix> {};
             gfs-fonts = super.callPackage <niveum/packages/gfs-fonts.nix> {};
-
+            fzf-wrappers = super.callPackage <niveum/packages/fzf-wrappers.nix> {};
-            kmein = {
-              autorenkalender = super.callPackage <niveum/packages/autorenkalender.nix> {};
-              bvg = super.callPackage <niveum/packages/bvg.nix> {};
-              daybook = super.callPackage <niveum/packages/daybook.nix> {};
-              genius = super.callPackage <niveum/packages/genius.nix> {};
-              instaget = super.callPackage <niveum/packages/instaget.nix> {};
-              literature-quote = super.callPackage <niveum/packages/literature-quote.nix> {};
-              n = super.callPackage <niveum/packages/n.nix> {};
-              depp = super.callPackage <niveum/packages/depp.nix> {};
-              odyssey = super.callPackage <niveum/packages/odyssey.nix> {};
-              wttr = super.callPackage <niveum/packages/wttr.nix> {};
-              nav = super.callPackage <niveum/packages/nav.nix> {};
-              dirmir = super.callPackage <niveum/packages/dirmir.nix> {};
-              favicon = super.callPackage <niveum/packages/favicon.nix> {};
-              tolino-screensaver = super.callPackage <niveum/packages/tolino-screensaver.nix> {};
-              # fzf-wrappers = pkgs.callPackage <niveum/packages/fzf-wrappers.nix> {}; (broken)
-              slide =
-                let slide-package = super.fetchFromGitHub {
-                  owner = "kmein";
-                  repo = "slide";
-                  rev = "0470583d22212745eab4f46076267addf4d2346c";
-                  sha256 = "0skcp3va9v4hmxy5ramghpz53gnyxv10wsacgmc2jr0v1wrqlzbh";
-                };
-                in super.callPackage slide-package {};
-              haskellPackages.mnemosyne =
-                let mnemosyne-package = super.fetchFromGitHub {
-                  repo = "mnemosyne";
-                  owner = "kmein";
-                  rev = "6bfa13c88db176af80be90840ff03573d67d679f";
-                  sha256 = "1rimv5c5q9602y501hbkgkfbimqnmdkcr5hp1434q06gcazhjhca";
-                };
-                in super.haskellPackages.callPackage mnemosyne-package {};
-            };
           })
         ];
       };

configs/git.nix

@@ -9,7 +9,6 @@
     pkgs.gitstats
     pkgs.patch
     pkgs.patchutils
-    pkgs.git-quick-stats
     pkgs.git-preview
   ];
 

configs/packages/default.nix

@@ -100,15 +100,13 @@
         (pass.withExtensions (ext: [ext.pass-otp]))
         fzf
         gnupg
-        kmein.haskellPackages.mnemosyne
+        kmein.mnemosyne
         kmein.favicon
         kmein.autorenkalender
         kmein.bvg
         kmein.daybook
         kmein.depp
         kmein.dirmir
-        # kmein.font-size (removed)
-        # kmein.fzf-wrappers (broken)
         kmein.genius
         kmein.instaget
         kmein.literature-quote
@@ -119,6 +117,7 @@
         kmein.tolino-screensaver
         memo
         nix-git
+        # fzf-wrappers
         par
         qrencode
         unstable.hugo

configs/packages/haskell/packages.nix

@@ -1,7 +1,5 @@
 haskellPackages:
 with haskellPackages; [
-  blessings
-  scanner
   HTTP
   HUnit
   MissingH

overlays/scripts.nix

@@ -0,0 +1,3 @@
+(self: super: {
+  kmein = import <niveum/packages/scripts> { pkgs = super; };
+})

packages/blessings.nix

@@ -1,14 +0,0 @@
-{ mkDerivation, base, fetchgit, hspec, QuickCheck, stdenv, text }:
-mkDerivation {
-  pname = "blessings";
-  version = "2.2.0";
-  src = fetchgit {
-    url = "https://cgit.krebsco.de/blessings";
-    sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1";
-    rev = "d94712a015636efe7ec79bc0a2eec6739d0be779";
-    fetchSubmodules = true;
-  };
-  libraryHaskellDepends = [ base text ];
-  testHaskellDepends = [ base hspec QuickCheck ];
-  license = stdenv.lib.licenses.mit;
-}

packages/font-size.nix

@@ -1,26 +0,0 @@
-{ writeShellScriptBin, font }:
-writeShellScriptBin "font-size" ''
-  set -efu
-
-  # set_font NORMAL_FONT BOLD_FONT
-  set_font() {
-    printf '\033]710;%s\007' "$1"
-    printf '\033]711;%s\007' "$2"
-  }
-
-  case ''${1-} in
-    '''|0|--reset)
-      set_font \
-          "xft:${font.name}:size=${toString font.size}" \
-          "xft:${font.name}:size=${toString font.size}:bold" \
-      ;;
-    [2-9]|[1-9][0-9]|[1-9][0-9][0-9])
-      set_font \
-          "xft:${font.name}:size=$1" \
-          "xft:${font.name}:size=$1:bold" \
-      ;;
-    *)
-      echo "$0: bad argument: $1" >&2
-      exit 1
-  esac
-''

packages/fzf-wrappers.nix

@@ -1,12 +1,12 @@
-{ write, lib, fzf, writers, findutils, procps, gnused, gawk, ripgrep }:
+{ lib, fzf, writers, findutils, procps, gnused, gawk, ripgrep, symlinkJoin }:
 let
-  wrappers.fe = writers.writeBash "fe" ''
+  wrappers.fe = writers.writeBashBin "fe" ''
     export PATH=$PATH:${fzf}/bin
 
     IFS=$'\n' files=($(fzf-tmux --query="$1" --multi --select-1 --exit-0))
     [[ -n "$files" ]] && ''${EDITOR:-vim} "''${files[@]}"
   '';
-  wrappers.fkill = writers.writeDash "fkill" ''
+  wrappers.fkill = writers.writeDashBin "fkill" ''
     export PATH=$PATH:${procps}/bin:${gawk}/bin:${gnused}/bin:${fzf}/bin:${findutils}/bin
 
     if [ "$UID" != "0" ]; then
@@ -20,7 +20,7 @@ let
         echo $pid | xargs kill -''${1:-9}
     fi
   '';
-  wrappers.vg = writers.writeBash "vg" ''
+  wrappers.vg = writers.writeBashBin "vg" ''
     export PATH=$PATH:${ripgrep}/bin:${fzf}/bin:${gawk}/bin
 
     file="$(rg "$@" | fzf -0 -1 | awk -F: '{print $1}')"
@@ -30,4 +30,7 @@ let
        ''${EDITOR:-vim} "$file"
     fi
   '';
-in write "fzf-wrappers" (lib.mapAttrs' (name: link: lib.nameValuePair "/bin/${name}" {inherit link;}) wrappers)
+in symlinkJoin {
+  name = "fzf-wrappers";
+  paths = lib.attrVals wrappers;
+}

packages/gfs-fonts.nix

@@ -5,19 +5,24 @@ let
     url = "http://www.greekfontsociety-gfs.gr/_assets/fonts/${name}.zip";
     postFetch = ''
       mkdir -p $out/share/fonts
-      unzip -j $downloadedFile "**/*otf" -d $out/share/fonts/opentype
+      unzip -j $downloadedFile "*.otf" -d $out/share/fonts/opentype
+      unzip -j $downloadedFile "**/*.otf" -d $out/share/fonts/opentype
     '';
   };
 in symlinkJoin {
   name = "gfs-fonts";
   paths = lib.mapAttrsToList gfs-font {
     GFS_Artemisia = "1q39086pr2jhv118fjfv6l1li6japv4pdjnhh1scqw06mqrmydf4";
+    GFS_Baskerville = "07gx5b9b43zv74d2lay37sajd4ba2wqn3b7xzvyhn265ds9x7cxk";
     GFS_Bodoni = "0jhl0728ikzha1krm01sk52nz3jzibidwmyvgidg61d87l8nbf2p";
+    GFS_Bodoni_Classic = "06jw2irskn75s50mgwkx08rzwqi82gpc6lgjsimsi8p81566gfrh";
+    GFS_Complutum = "1q7dxs2z3yrgchd2pz9h72mjrk62kdc2mmqw8kg9q76k28f8n3p0"; # -> GFSPolyglot.otf
     GFS_Decker = "016v1j5n9ph4i2cpmlk26pcxhp3q2fjwlaryppd5akl84dfkpncl";
     GFS_Didot = "0ysvrp527wm0wxfp6wmlgmxfx7ysr5mwpmjmqp1h605cy44jblfm";
     GFS_Didot_Classic = "0n5awqksvday3l3d85yhwmbmfj9bcpxivy4wpd4zrkgl7b85af2c";
     GFS_Didot_Display = "0gg5xb8jic646gz9p05ry62nk7w0k546fxp5p4vvnawmckql2dj1";
     GFS_Elpis = "02l7wd3nbn1kpv7ghxh19k4dbvd49ijyxd6gq83gcr9vlmxcq2s2";
+    GFS_Gazis = "0x9iwj6pinaykrds0iw6552hf256d0dr41sipdb1jnnlr2d3bf9w";
     GFS_Goschen = "1jvbn33wzq2yj0aygwy9pd2msg3wkmdp0npjzazadrmfjpnpkcy9";
     GFS_NeoHellenic = "1ixm2frdc6i5lbn9h0h4gdsvsw2k4hny75q8ig4kgs28ac3dbzq3";
     GFS_Olga = "0f05ng02na84x9x6yhskxqwxwyabjisyl8a0k3fiah60i620p39d";

packages/scripts/default.nix

@@ -0,0 +1,34 @@
+{ pkgs, ... }:
+{
+  autorenkalender = pkgs.callPackage ./autorenkalender.nix {};
+  bvg = pkgs.callPackage ./bvg.nix {};
+  daybook = pkgs.callPackage ./daybook.nix {};
+  depp = pkgs.callPackage ./depp.nix {};
+  dirmir = pkgs.callPackage ./dirmir.nix {};
+  favicon = pkgs.callPackage ./favicon.nix {};
+  genius = pkgs.callPackage ./genius.nix {};
+  instaget = pkgs.callPackage ./instaget.nix {};
+  literature-quote = pkgs.callPackage ./literature-quote.nix {};
+  man-pdf = pkgs.callPackage ./man-pdf.nix {};
+  n = pkgs.callPackage ./n.nix {};
+  nav = pkgs.callPackage ./nav.nix {};
+  odyssey = pkgs.callPackage ./odyssey.nix {};
+  tolino-screensaver = pkgs.callPackage ./tolino-screensaver.nix {};
+  wttr = pkgs.callPackage ./wttr.nix {};
+  slide =
+    let slide-package = pkgs.fetchFromGitHub {
+      owner = "kmein";
+      repo = "slide";
+      rev = "0470583d22212745eab4f46076267addf4d2346c";
+      sha256 = "0skcp3va9v4hmxy5ramghpz53gnyxv10wsacgmc2jr0v1wrqlzbh";
+    };
+    in pkgs.callPackage slide-package {};
+  mnemosyne =
+    let mnemosyne-package = pkgs.fetchFromGitHub {
+      repo = "mnemosyne";
+      owner = "kmein";
+      rev = "6bfa13c88db176af80be90840ff03573d67d679f";
+      sha256 = "1rimv5c5q9602y501hbkgkfbimqnmdkcr5hp1434q06gcazhjhca";
+    };
+    in pkgs.haskellPackages.callPackage mnemosyne-package {};
+}