10 files changed, 108 insertions, 98 deletions
diff --git a/makefu/5pkgs/Fluffy/default.nix b/makefu/5pkgs/Fluffy/default.nix
new file mode 100644
index 000000000..59a04a52d
--- /dev/null
+++ b/makefu/5pkgs/Fluffy/default.nix
@@ -0,0 +1,42 @@
+{ lib, pkgs, python3Packages, ... }:
+
+with python3Packages; buildPythonApplication rec {
+  name = "Fluffy-${version}";
+  format = "other";
+  version = "2.7";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "fourminute";
+    repo = "Fluffy";
+    rev = "v${version}";
+    sha256 = "1l346bklidcl40q91cfdszrfskdwlmfjbmsc3mgs0i8wi1yhvq99";
+  };
+
+  prePatch = ''
+    sed -e "s|/tmp|$HOME/.config/fluffy|" -i linux/fluffy.desktop
+  '';
+
+  installPhase = ''
+    env
+    install -Dm 644 linux/80-fluffy-switch.rules "$out/etc/udev/rules.d/80-fluffy-switch.rules"
+    install -Dm 644 linux/fluffy.desktop "$out/usr/share/applications/fluffy.desktop"
+    install -Dm 644 icons/16x16/fluffy.png "$out/share/icons/hicolor/16x16/apps/fluffy.png"
+    install -Dm 644 icons/24x24/fluffy.png "$out/share/icons/hicolor/24x24/apps/fluffy.png"
+    install -Dm 644 icons/32x32/fluffy.png "$out/share/icons/hicolor/32x32/apps/fluffy.png"
+    install -Dm 644 icons/48x48/fluffy.png "$out/share/icons/hicolor/48x48/apps/fluffy.png"
+    install -Dm 644 icons/64x64/fluffy.png "$out/share/icons/hicolor/64x64/apps/fluffy.png"
+    install -Dm 644 icons/128x128/fluffy.png "$out/share/icons/hicolor/128x128/apps/fluffy.png"
+    install -Dm 755 fluffy.pyw "$out/bin/fluffy"
+    wrapProgram  "$out/bin/fluffy" --set PYTHONPATH "$PYTHONPATH"
+  '';
+
+  propagatedBuildInputs = [
+    pyqt5 pyusb  libusb1 configparser tkinter
+  ];
+
+  meta = {
+    homepage = https://github.com/fourminute/Fluffy;
+    description = "A feature-rich tool for installing NSPs";
+    license = lib.licenses.gpl3;
+  };
+}
diff --git a/makefu/5pkgs/ampel/default.nix b/makefu/5pkgs/ampel/default.nix
index 9792c2c59..fb722a52f 100644
--- a/makefu/5pkgs/ampel/default.nix
+++ b/makefu/5pkgs/ampel/default.nix
@@ -2,7 +2,7 @@
 
 with pkgs.python3Packages;buildPythonPackage rec {
   name = "ampel-${version}";
-  version = "0.2.1";
+  version = "0.2.5";
 
   propagatedBuildInputs = [
     docopt
@@ -16,8 +16,8 @@ with pkgs.python3Packages;buildPythonPackage rec {
 
   src = pkgs.fetchgit {
       url = "http://cgit.euer.krebsco.de/ampel";
-      rev = "92321d7";
-      sha256 = "0mvpbpf1rx8sc589qjb73gl8z6fir2zs3gl3br1pbhg5jgn0ij4n";
+      rev = "ce239876820699f02054e71b4fd0950509833379";
+      sha256 = "1ja32lr04lwq4shi49kppa1zzjw0zlqaqy71pr5sbajgp4zj7kh8";
   };
   meta = {
     homepage = http://cgit.euer.krebsco.de/ampel;
diff --git a/makefu/5pkgs/awesomecfg/default.nix b/makefu/5pkgs/awesomecfg/default.nix
index 486c0ddf6..1ae2f50d9 100644
--- a/makefu/5pkgs/awesomecfg/default.nix
+++ b/makefu/5pkgs/awesomecfg/default.nix
@@ -5,6 +5,7 @@
 , networkmanagerapplet
 , blueman
 , clipit
+, flameshot
 , modkey ? "Mod4"
 , locker? "${pkgs.xlock}/bin/xlock -mode blank"
 , ... }:
@@ -13,7 +14,7 @@
   # replace: @alsaUtils@ @xlockmore@ @xbacklight@ @modkey@
   full = lib.makeOverridable pkgs.substituteAll {
     name = "awesome_full_config";
-    inherit alsaUtils locker xbacklight modkey networkmanagerapplet blueman clipit;
+    inherit alsaUtils locker xbacklight modkey networkmanagerapplet blueman clipit flameshot ;
     isExecutable = false;
     src = ./full.cfg;
   };
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index 11f9f59b8..83dd79b4d 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -410,6 +410,7 @@ clientkeys = awful.util.table.join(
             -- minimized, since minimized clients can't have the focus.
             c.minimized = true
         end),
+    awful.key({ }, "Print", function () awful.util.spawn("@flameshot@/bin/flameshot gui") end),
     awful.key({ modkey,           }, "m",
         function (c)
             c.maximized = not c.maximized
diff --git a/makefu/5pkgs/bento4/default.nix b/makefu/5pkgs/bento4/default.nix
deleted file mode 100644
index 6f5f1deba..000000000
--- a/makefu/5pkgs/bento4/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchFromGitHub
-, cmake
-}:
-stdenv.mkDerivation rec {
-  name = "bento4-${version}";
-  version = "1.5.1-624";
-
-  src = fetchFromGitHub {
-    owner = "axiomatic-systems";
-    repo = "Bento4";
-    rev = "v${version}";
-    sha256 = "1cq6vhrq3n3lc1n454slbc66qdyqam2srxgdhfpyfxbq5c4y06nf";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  installPhase = ''
-    mkdir -p $out/{lib,bin}
-    find -iname '*.so' -exec mv --target-directory="$out/lib" {} \;
-    find -maxdepth 1 -executable -type f -exec mv --target-directory="$out/bin" {} \;
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Full-featured MP4 format and MPEG DASH library and tools";
-    homepage = http://bento4.com;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ makefu ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 8ae41427c..1ae10459f 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -1,4 +1,4 @@
-self: super: 
+self: super:
 with super.lib; with builtins; let
   # This callPackage will try to detect obsolete overrides.
   callPackage = path: args: let
diff --git a/makefu/5pkgs/nixpkgs-pytools/default.nix b/makefu/5pkgs/nixpkgs-pytools/default.nix
new file mode 100644
index 000000000..35146d155
--- /dev/null
+++ b/makefu/5pkgs/nixpkgs-pytools/default.nix
@@ -0,0 +1,17 @@
+{pkgs, fetchFromGitHub}:
+with pkgs.python3.pkgs;
+
+buildPythonPackage rec {
+  pname = "nixpkgs-pytools";
+  version = "1.0.0-dev";
+  src = fetchFromGitHub {
+    owner = "nix-community";
+    repo = pname;
+    rev = "593443b5689333cad3b6fa5b42e96587df68b0f8";
+    sha256 = "1cjpngr1rn5q59a1krgmpq2qm96wbiirc8yf1xmm21p3mskb2db4";
+  };
+  propagatedBuildInputs = [
+    jinja2 setuptools
+  ];
+  checkInputs = [ black ];
+}
diff --git a/makefu/5pkgs/prison-break/default.nix b/makefu/5pkgs/prison-break/default.nix
new file mode 100644
index 000000000..f86ac3762
--- /dev/null
+++ b/makefu/5pkgs/prison-break/default.nix
@@ -0,0 +1,20 @@
+{pkgs, fetchFromGitHub}:
+with pkgs.python3.pkgs;
+
+buildPythonPackage rec {
+  pname = "prison-break";
+  version = "0.1.0";
+  src = fetchFromGitHub {
+    owner = "makefu";
+    repo = pname;
+    rev = "5eed6371e151e716faafa054e005bd98d77b4b5d";
+    sha256 = "170zs9grbgkx83ghg6pm13v7vhi604y44j550ypp2x26nidaw63j";
+  };
+  propagatedBuildInputs = [
+    docopt
+    requests
+    beautifulsoup4
+    (callPackage ./straight-plugin.nix {})
+  ];
+  checkInputs = [ black ];
+}
diff --git a/makefu/5pkgs/prison-break/straight-plugin.nix b/makefu/5pkgs/prison-break/straight-plugin.nix
new file mode 100644
index 000000000..606c60b5d
--- /dev/null
+++ b/makefu/5pkgs/prison-break/straight-plugin.nix
@@ -0,0 +1,22 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "straight-plugin";
+  version = "1.5.0";
+
+  src = fetchPypi {
+    pname = "straight.plugin";
+    inherit version;
+    sha256 = "818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38";
+  };
+
+  meta = with lib; {
+    description = "A simple namespaced plugin facility";
+    homepage = https://github.com/ironfroggy/straight.plugin;
+    license = licenses.mit;
+    maintainers = [ maintainers.makefu ];
+  };
+}
diff --git a/makefu/5pkgs/targetcli/default.nix b/makefu/5pkgs/targetcli/default.nix
deleted file mode 100644
index 927c34c5a..000000000
--- a/makefu/5pkgs/targetcli/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ pkgs, fetchFromGitHub, ... }:
-with pkgs.python2Packages;
-let
-  version = "2.1";
-  rtslib = buildPythonPackage rec {
-    pname = "rtslib";
-    inherit version;
-    src = fetchFromGitHub {
-      owner = "datera";
-      repo = "rtslib";
-      rev = version;
-      sha256 = "1d58k9i4xigfqgycyismsqzkz65ssjdri2v9fg0wpica1klyyv22";
-    };
-    propagatedBuildInputs = [ ipaddr netifaces configobj ];
-  };
-  configshell = buildPythonPackage rec {
-    pname = "configshell";
-    version = "1.6";
-    src = fetchFromGitHub {
-      owner = "datera";
-      repo = "configshell";
-      rev = version;
-      sha256 = "14n7xbcaicsvwajv1aihz727dlkn6zfaqjbnn7mcpns83c2hms7y";
-    };
-    propagatedBuildInputs = [ pyparsing ];
-  };
-
-  tcm-py  = buildPythonPackage rec {
-    pname = "tcm-py";
-    version = "0ac9091c1ff7a52d5435a4f4449e82637142e06e";
-    src = fetchFromGitHub {
-      owner = "datera";
-      repo = "lio-utils";
-      rev = "0ac9091c1ff7a52d5435a4f4449e82637142e06e";
-      sha256 = "0fc922kxvgr7rwg1y875vqvkipcrixmlafsp5g8mipmq90i8zcq0";
-    } + "/tcm-py";
-    propagatedBuildInputs = [ ];
-  };
-
-  lio-py = buildPythonPackage rec {
-    pname = "lio-py";
-    version = "0ac9091c1ff7a52d5435a4f4449e82637142e06e";
-    src = fetchFromGitHub {
-      owner = "datera";
-      repo = "lio-utils";
-      rev = "0ac9091c1ff7a52d5435a4f4449e82637142e06e";
-      sha256 = "0fc922kxvgr7rwg1y875vqvkipcrixmlafsp5g8mipmq90i8zcq0";
-    } + "/lio-py";
-    propagatedBuildInputs = [ ];
-  };
-
-in buildPythonApplication rec {
-  pname = "targetcli";
-  inherit version;
-
-  propagatedBuildInputs = [ rtslib configshell lio-py tcm-py ];
-
-  src = fetchFromGitHub {
-    owner = "datera";
-    repo = "targetcli";
-    rev = version;
-    sha256 = "10nax7761g93qzky01y3hra8i4s11cgyy9w5w6l8781lj21lgi3d";
-  };
-}