xmonad: use new image-generator

pkgs/default.nix

@@ -7,11 +7,8 @@ let
   unstablePkgs = import <nixpkgs-unstable> { };
 
 in {
-  haskellPackages = super.haskellPackages.override {
-    overrides = self: super: {
-      image-generator = super.callPackage ./image-generator { };
-    };
-  };
+
+  image-generator = super.callPackage ./image-generator { };
 
   bitwig-studio1 = super.bitwig-studio1.override {
     libxkbcommon = super.libxkbcommon.overrideAttrs (old: rec {

pkgs/image-generator/default.nix

@@ -1,33 +1,26 @@
-{ mkDerivation, base, colour, diagrams-cairo, diagrams-contrib, diagrams-core
-, diagrams-lib, diagrams-svg, extra, fetchgit, optparse-applicative, primes
-, random, stdenv }:
-mkDerivation {
-  pname = "image-generator";
-  version = "0.1.1.0";
+{ rustPlatform, fetchgit, stdenv, cairo, ... }:
+
+rustPlatform.buildRustPackage rec {
+  name = "image-geneartor-${version}";
+  version = "2.0.0";
+  # src = ./.;
   src = fetchgit {
-    url = "https://git.ingolf-wagner.de/palo/image-generator.git";
-    sha256 = "0hgbp0sxy7vjgx2zv1r05gvry0k6r2cldjmj5q75d9c8gp6n5cc1";
-    rev = "ef68d8bd027b69fc96f821849c695a2b3e5c9e49";
-    fetchSubmodules = true;
+    url = "https://git.ingolf-wagner.de/palo/image-generator2";
+    rev = "c9ef48b1bd73a819a5fb86095774472f35d7b576";
+    sha256 = "0pdhw2calqxczdrz66wyvydd5d6m2fx7xm64z1l25nazdad930p5";
+  };
+  cargoSha256 = "07pwds279qc54g5fza805ah2m8jhrdzng7vb1bi24a9ra9ci8s29";
+  verifyCargoDeps = true;
+
+  buildInputs = [ cairo ];
+
+  meta = with stdenv.lib; {
+    description =
+      "An image generator unsing entropy and a JSON as configuration.";
+    homepage = "https://git.ingolf-wagner.de/palo/image-generator2";
+    license = licenses.gplv3;
+    maintainers = [ maintainers.mrVanDalo ];
+    platforms = platforms.all;
   };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [ base ];
-  executableHaskellDepends = [
-    base
-    colour
-    diagrams-cairo
-    diagrams-contrib
-    diagrams-core
-    diagrams-lib
-    diagrams-svg
-    extra
-    optparse-applicative
-    primes
-    random
-  ];
-  doHaddock = false;
-  homepage = "https://git.ingolf-wagner.de/palo/image-generator";
-  description = "https://git.ingolf-wagner.de/palo/image-generator";
-  license = stdenv.lib.licenses.gpl3;
 }
+

pkgs/museek/default.nix

@@ -1,4 +1,5 @@
-{ stdenv, fetchgit, pkgconfig, curl, glib, id3lib, libxml2, cmake, libevent , libxmlxx, ... }:
+{ stdenv, fetchgit, pkgconfig, curl, glib, id3lib, libxml2, cmake, libevent
+, libxmlxx, ... }:
 
 stdenv.mkDerivation rec {
   version = "0.2";

system/desktop/home-manager/xmonad.nix

@@ -1,6 +1,11 @@
 { pkgs, lib, config, ... }:
 let
 
+  background-repo = pkgs.fetchgit {
+    url = "https://git.ingolf-wagner.de/palo/image-generator-lib";
+    rev = "066e157b4c438205c291fcd57450740aeaec27cc";
+    sha256 = "04as4sfd8da36zcw1yfj7kqp05gypzr79x1i7rjclaak46zp4zlg";
+  };
   nixCommands = { height, width }:
     pkgs.writeText "NixCommands.hs" # haskell
     ''
@@ -13,7 +18,7 @@ let
       nixStartRedshift = "${pkgs.redshift}/bin/redshift -O 6100 -g 0.9:0.9:0.9 -b 0.9"
       nixResetRedshift = "${pkgs.redshift}/bin/redshift -x"
       nixSetCursorImage = "${pkgs.xorg.xsetroot}/bin/xsetroot -cursor_name left_ptr"
-      nixSetBackground = "${pkgs.haskellPackages.image-generator}/bin/image-generator --height ${
+      nixSetBackground = "${pkgs.image-generator}/bin/image-generator --line-size 2.0 ${background-repo}/tictoctoe.json --height ${
         toString height
       } --width ${
         toString width

system/desktop/packages.nix

@@ -286,7 +286,7 @@ in {
       screenKey
       replaceLinks
 
-      haskellPackages.image-generator
+      image-generator
 
       w3m
       links