4 files changed, 31 insertions, 3 deletions
diff --git a/lass/5pkgs/custom/xmonad-lass/default.nix b/lass/5pkgs/custom/xmonad-lass/default.nix
index 18cb25b5b..868c1072a 100644
--- a/lass/5pkgs/custom/xmonad-lass/default.nix
+++ b/lass/5pkgs/custom/xmonad-lass/default.nix
@@ -90,7 +90,7 @@ main' = do
 
 myLayoutHook = defLayout
   where
-    defLayout = minimize $ ((avoidStruts $ Tall 1 (3/100) (1/2) ||| Full ||| Mirror (Tall 1 (3/100) (1/2))) ||| FixedColumn 2 80 80 1 ||| simplestFloat)
+    defLayout = minimize $ ((avoidStruts $ Mirror (Tall 1 (3/100) (1/2))) ||| Full ||| FixedColumn 2 80 80 1 ||| Tall 1 (3/100) (1/2) ||| simplestFloat)
 
 floatHooks :: Query (Endo WindowSet)
 floatHooks = composeAll . concat $
diff --git a/lass/5pkgs/l-gen-secrets/default.nix b/lass/5pkgs/l-gen-secrets/default.nix
index 4b25fbd4c..b6cb2ec7e 100644
--- a/lass/5pkgs/l-gen-secrets/default.nix
+++ b/lass/5pkgs/l-gen-secrets/default.nix
@@ -17,9 +17,9 @@ pkgs.writeDashBin "l-gen-secrets" ''
 
   cd $TMPDIR
   for x in *; do
-    ${pkgs.coreutils}/bin/cat $x | ${pkgs.pass}/bin/pass insert -m krebs-secrets/$HOSTNAME/$x > /dev/null
+    ${pkgs.coreutils}/bin/cat $x | ${pkgs.pass}/bin/pass insert -m hosts/$HOSTNAME/$x > /dev/null
   done
-  echo $PASSWORD | ${pkgs.pass}/bin/pass insert -m hosts/$HOSTNAME/pass > /dev/null
+  echo $PASSWORD | ${pkgs.pass}/bin/pass insert -m admin/$HOSTNAME/pass > /dev/null
 
   cat <<EOF
     $HOSTNAME = {
diff --git a/lass/5pkgs/nichtparasoup/default.nix b/lass/5pkgs/nichtparasoup/default.nix
new file mode 100644
index 000000000..fcff7ad54
--- /dev/null
+++ b/lass/5pkgs/nichtparasoup/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, pkgs, ... }:
+let
+  py = pkgs.python3Packages.python.withPackages (p: [
+    p.werkzeug
+    p.beautifulsoup4
+  ]);
+  src = pkgs.fetchFromGitHub {
+    owner = "k4cg";
+    repo = "nichtparasoup";
+    rev = "c6dcd0d";
+    sha256 = "10xy20bjdnd5bjv2hf6v5y5wi0mc9555awxkjqf57rk6ngc5w6ss";
+  };
+in pkgs.writeDashBin "nichtparasoup" ''
+  ${py}/bin/python ${src}/nichtparasoup.py "$@"
+''
diff --git a/lass/5pkgs/nichtparasoup/exception.patch b/lass/5pkgs/nichtparasoup/exception.patch
new file mode 100644
index 000000000..34c177de0
--- /dev/null
+++ b/lass/5pkgs/nichtparasoup/exception.patch
@@ -0,0 +1,13 @@
+diff --git a/nichtparasoup.py b/nichtparasoup.py
+index 9da9a2b..833ca71 100755
+--- a/nichtparasoup.py
++++ b/nichtparasoup.py
+@@ -211,7 +211,7 @@ def cache_fill_loop():
+                     try:
+                         sources[crawler][site].crawl()
+                         info = Crawler.info()
+-                    except Exception, e:
++                    except Exception as e:
+                         logger.error("Error in crawler %s - %s: %s" % (crawler, site, e))
+                         break
+