From 5fe30a149d649b24cb0c55e398064adfce51614c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 4 May 2018 20:30:51 +0200
Subject: l: init nichtparasoup

---
 lass/5pkgs/nichtparasoup/default.nix     | 25 +++++++++++++++++++++++++
 lass/5pkgs/nichtparasoup/exception.patch | 13 +++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 lass/5pkgs/nichtparasoup/default.nix
 create mode 100644 lass/5pkgs/nichtparasoup/exception.patch

(limited to 'lass/5pkgs')

diff --git a/lass/5pkgs/nichtparasoup/default.nix b/lass/5pkgs/nichtparasoup/default.nix
new file mode 100644
index 000000000..cf34c683f
--- /dev/null
+++ b/lass/5pkgs/nichtparasoup/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, pkgs, ... }:
+let
+  py = pkgs.python3Packages.python.withPackages (p: [
+    p.werkzeug
+    p.beautifulsoup4
+  ]);
+  src = pkgs.fetchFromGitHub {
+    owner = "k4cg";
+    repo = "nichtparasoup";
+    rev = "cf164b5";
+    sha256 = "09bwh76agp14j8rv7bp47jcwhffc1b0bak0ikvzxyphph5lyidk9";
+  };
+  patchedSrc = stdenv.mkDerivation {
+    name = "nichtparasoup";
+    inherit src;
+    patches = [ ./exception.patch ];
+    phases = [ "unpackPhase" "patchPhase" "installPhase" ];
+    installPhase = ''
+      mkdir -p $out
+      cp -r * $out/
+    '';
+  };
+in pkgs.writeDashBin "nichtparasoup" ''
+  ${py}/bin/python ${patchedSrc}/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
+ 
-- 
cgit v1.2.3


From e1a0d9409d7f7e1c60f98ef2ee69cfecc445aa08 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 4 May 2018 20:59:08 +0200
Subject: l nichtparasoup: cf164b5 -> c6dcd0d

---
 lass/5pkgs/nichtparasoup/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'lass/5pkgs')

diff --git a/lass/5pkgs/nichtparasoup/default.nix b/lass/5pkgs/nichtparasoup/default.nix
index cf34c683f..fcff7ad54 100644
--- a/lass/5pkgs/nichtparasoup/default.nix
+++ b/lass/5pkgs/nichtparasoup/default.nix
@@ -7,19 +7,9 @@ let
   src = pkgs.fetchFromGitHub {
     owner = "k4cg";
     repo = "nichtparasoup";
-    rev = "cf164b5";
-    sha256 = "09bwh76agp14j8rv7bp47jcwhffc1b0bak0ikvzxyphph5lyidk9";
-  };
-  patchedSrc = stdenv.mkDerivation {
-    name = "nichtparasoup";
-    inherit src;
-    patches = [ ./exception.patch ];
-    phases = [ "unpackPhase" "patchPhase" "installPhase" ];
-    installPhase = ''
-      mkdir -p $out
-      cp -r * $out/
-    '';
+    rev = "c6dcd0d";
+    sha256 = "10xy20bjdnd5bjv2hf6v5y5wi0mc9555awxkjqf57rk6ngc5w6ss";
   };
 in pkgs.writeDashBin "nichtparasoup" ''
-  ${py}/bin/python ${patchedSrc}/nichtparasoup.py "$@"
+  ${py}/bin/python ${src}/nichtparasoup.py "$@"
 ''
-- 
cgit v1.2.3


From af75b96fbe412527c4bf9129de850bcab3e7c7cb Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 8 May 2018 08:31:53 +0200
Subject: l xmonad: change default layout order

---
 lass/5pkgs/custom/xmonad-lass/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/5pkgs')

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 $
-- 
cgit v1.2.3


From dca292c905b09eff69e0219472c7846a55a0bb72 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 16 May 2018 17:32:29 +0200
Subject: l l-gen-secrets: fix secret paths

---
 lass/5pkgs/l-gen-secrets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lass/5pkgs')

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 = {
-- 
cgit v1.2.3