From 7840dca23881cd1b96e179e3c8a4a87e73d5f00c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Sun, 13 Mar 2022 17:22:13 +0100
Subject: external: add home.kmein.r

---
 krebs/3modules/external/kmein.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/krebs/3modules/external/kmein.nix b/krebs/3modules/external/kmein.nix
index 4605fbdf0..6e4457eae 100644
--- a/krebs/3modules/external/kmein.nix
+++ b/krebs/3modules/external/kmein.nix
@@ -125,6 +125,7 @@ in
           "grocy.kmein.r"
           "moodle.kmein.r"
           "radio.kmein.r"
+          "home.kmein.r"
         ];
         tinc.pubkey = ''
           -----BEGIN RSA PUBLIC KEY-----
-- 
cgit v1.2.3


From 9cb3aa8c53e6035a488fd8d8101960e0bdd8dfab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 15 Mar 2022 19:55:21 +0100
Subject: l nichtparasoup: enrich reddit experience

---
 lass/3modules/nichtparasoup.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lass/3modules/nichtparasoup.nix b/lass/3modules/nichtparasoup.nix
index 632481b69..0ce099c92 100644
--- a/lass/3modules/nichtparasoup.nix
+++ b/lass/3modules/nichtparasoup.nix
@@ -24,7 +24,7 @@ with import <stockholm/lib>;
         [Sites]
         SoupIO: everyone
         Pr0gramm: new,top
-        Reddit: gifs,reactiongifs,ANormalDayInRussia,perfectloops,reallifedoodles,bizarrebuildings,cablefail,cableporn,educationalgifs,EngineeringPorn,holdmybeer,itsaunixsystem,loadingicon,michaelbaygifs,nononoyesno,oddlysatisfying,ofcoursethatsathing,OSHA,PeopleFuckingDying,PerfectTiming,PixelArt,RetroFuturism,robotsbeingjerks,scriptedasiangifs,shittyrobots,startrekstabilized,ThingsCutInHalfPorn,totallynotrobots,Unexpected
+        Reddit: gifs,reactiongifs,ANormalDayInRussia,perfectloops,reallifedoodles,bizarrebuildings,cablefail,cableporn,educationalgifs,EngineeringPorn,holdmybeer,itsaunixsystem,loadingicon,michaelbaygifs,nononoyesno,oddlysatisfying,ofcoursethatsathing,OSHA,PeopleFuckingDying,PerfectTiming,PixelArt,RetroFuturism,robotsbeingjerks,scriptedasiangifs,shittyrobots,startrekstabilized,ThingsCutInHalfPorn,totallynotrobots,Unexpected,abandonedporn,animalsbeingderps,assholedesign,bonehurtingjuice,boottoobig,bossfight,buddhistmemes,catastrophicfailure,chairsunderwater,clevercomebacks,crappydesign,cursedcomments,desirepath,doenerverbrechen,dontdeadopeninside,eyebleach,forbiddensnacks,funnyanimals,grssk,hmm,holup,iamatotalpieceofshit,ichbin40undlustig,idiotsincars,illegallysmolcats,instagramreality,instant_regret,kamikazebywords,keming,kidsarefuckingstupid,kitchenconfidential,laughingbuddha,mildlyinfuriating,natureisfuckinglit,nononoyesno,notinteresting,notliketheothergirls,picsofunusualbirds,pizzacrimes,prequelmemes,shitposting,shittyfoodporn,softwaregore,startledcats,stupidfood,techsupportgore,thathappened,trippinthroughtime,unexpected,wewantplates,wasletztepreis,wellthatsucks,whatsthisbug,whatsthisplant,whatswrongwithyourdog,whenthe,whatcouldgowrong,yesyesyesyesno,youseeingthisshit
         NineGag: geeky,wtf,hot,trending
         Instagram: nature,wtf
         Fourchan: sci
-- 
cgit v1.2.3


From 45bb3b29ed509a38812c53a5b2a4e0175792dbf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 15 Mar 2022 20:02:17 +0100
Subject: l nichtparasoup: concatStringsSep

---
 lass/3modules/nichtparasoup.nix | 90 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/lass/3modules/nichtparasoup.nix b/lass/3modules/nichtparasoup.nix
index 0ce099c92..6865bafec 100644
--- a/lass/3modules/nichtparasoup.nix
+++ b/lass/3modules/nichtparasoup.nix
@@ -24,7 +24,95 @@ with import <stockholm/lib>;
         [Sites]
         SoupIO: everyone
         Pr0gramm: new,top
-        Reddit: gifs,reactiongifs,ANormalDayInRussia,perfectloops,reallifedoodles,bizarrebuildings,cablefail,cableporn,educationalgifs,EngineeringPorn,holdmybeer,itsaunixsystem,loadingicon,michaelbaygifs,nononoyesno,oddlysatisfying,ofcoursethatsathing,OSHA,PeopleFuckingDying,PerfectTiming,PixelArt,RetroFuturism,robotsbeingjerks,scriptedasiangifs,shittyrobots,startrekstabilized,ThingsCutInHalfPorn,totallynotrobots,Unexpected,abandonedporn,animalsbeingderps,assholedesign,bonehurtingjuice,boottoobig,bossfight,buddhistmemes,catastrophicfailure,chairsunderwater,clevercomebacks,crappydesign,cursedcomments,desirepath,doenerverbrechen,dontdeadopeninside,eyebleach,forbiddensnacks,funnyanimals,grssk,hmm,holup,iamatotalpieceofshit,ichbin40undlustig,idiotsincars,illegallysmolcats,instagramreality,instant_regret,kamikazebywords,keming,kidsarefuckingstupid,kitchenconfidential,laughingbuddha,mildlyinfuriating,natureisfuckinglit,nononoyesno,notinteresting,notliketheothergirls,picsofunusualbirds,pizzacrimes,prequelmemes,shitposting,shittyfoodporn,softwaregore,startledcats,stupidfood,techsupportgore,thathappened,trippinthroughtime,unexpected,wewantplates,wasletztepreis,wellthatsucks,whatsthisbug,whatsthisplant,whatswrongwithyourdog,whenthe,whatcouldgowrong,yesyesyesyesno,youseeingthisshit
+        Reddit: ${lib.concatStringsSep "," [
+          "ANormalDayInRussia"
+          "EngineeringPorn"
+          "OSHA"
+          "PeopleFuckingDying"
+          "PerfectTiming"
+          "PixelArt"
+          "RetroFuturism"
+          "ThingsCutInHalfPorn"
+          "Unexpected"
+          "abandonedporn"
+          "animalsbeingderps"
+          "assholedesign"
+          "bizarrebuildings"
+          "bonehurtingjuice"
+          "boottoobig"
+          "bossfight"
+          "buddhistmemes"
+          "cablefail"
+          "cableporn"
+          "catastrophicfailure"
+          "chairsunderwater"
+          "clevercomebacks"
+          "crappydesign"
+          "cursedcomments"
+          "desirepath"
+          "doenerverbrechen"
+          "dontdeadopeninside"
+          "educationalgifs"
+          "eyebleach"
+          "forbiddensnacks"
+          "funnyanimals"
+          "gifs"
+          "grssk"
+          "hmm"
+          "holdmybeer"
+          "holup"
+          "iamatotalpieceofshit"
+          "ichbin40undlustig"
+          "idiotsincars"
+          "illegallysmolcats"
+          "instagramreality"
+          "instant_regret"
+          "itsaunixsystem"
+          "kamikazebywords"
+          "keming"
+          "kidsarefuckingstupid"
+          "kitchenconfidential"
+          "laughingbuddha"
+          "loadingicon"
+          "michaelbaygifs"
+          "mildlyinfuriating"
+          "natureisfuckinglit"
+          "nononoyesno"
+          "notinteresting"
+          "notliketheothergirls"
+          "oddlysatisfying"
+          "ofcoursethatsathing"
+          "perfectloops"
+          "picsofunusualbirds"
+          "pizzacrimes"
+          "prequelmemes"
+          "reactiongifs"
+          "reallifedoodles"
+          "robotsbeingjerks"
+          "scriptedasiangifs"
+          "shitposting"
+          "shittyfoodporn"
+          "shittyrobots"
+          "softwaregore"
+          "startledcats"
+          "startrekstabilized"
+          "stupidfood"
+          "techsupportgore"
+          "thathappened"
+          "totallynotrobots"
+          "trippinthroughtime"
+          "unexpected"
+          "wasletztepreis"
+          "wellthatsucks"
+          "wewantplates"
+          "whatcouldgowrong"
+          "whatsthisbug"
+          "whatsthisplant"
+          "whatswrongwithyourdog"
+          "whenthe"
+          "yesyesyesyesno"
+          "youseeingthisshit"
+        ]}
         NineGag: geeky,wtf,hot,trending
         Instagram: nature,wtf
         Fourchan: sci
-- 
cgit v1.2.3


From 9ffb30119327ea3f30865d8cc1ca50309194d19e Mon Sep 17 00:00:00 2001
From: Felix <git@flx.ai>
Date: Tue, 15 Mar 2022 20:12:06 +0100
Subject: l nichtparasoup: sort entries

---
 lass/3modules/nichtparasoup.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lass/3modules/nichtparasoup.nix b/lass/3modules/nichtparasoup.nix
index 6865bafec..37b55ad2d 100644
--- a/lass/3modules/nichtparasoup.nix
+++ b/lass/3modules/nichtparasoup.nix
@@ -25,17 +25,9 @@ with import <stockholm/lib>;
         SoupIO: everyone
         Pr0gramm: new,top
         Reddit: ${lib.concatStringsSep "," [
-          "ANormalDayInRussia"
-          "EngineeringPorn"
-          "OSHA"
-          "PeopleFuckingDying"
-          "PerfectTiming"
-          "PixelArt"
-          "RetroFuturism"
-          "ThingsCutInHalfPorn"
-          "Unexpected"
           "abandonedporn"
           "animalsbeingderps"
+          "ANormalDayInRussia"
           "assholedesign"
           "bizarrebuildings"
           "bonehurtingjuice"
@@ -53,6 +45,7 @@ with import <stockholm/lib>;
           "doenerverbrechen"
           "dontdeadopeninside"
           "educationalgifs"
+          "EngineeringPorn"
           "eyebleach"
           "forbiddensnacks"
           "funnyanimals"
@@ -82,12 +75,17 @@ with import <stockholm/lib>;
           "notliketheothergirls"
           "oddlysatisfying"
           "ofcoursethatsathing"
+          "OSHA"
+          "PeopleFuckingDying"
           "perfectloops"
+          "PerfectTiming"
           "picsofunusualbirds"
+          "PixelArt"
           "pizzacrimes"
           "prequelmemes"
           "reactiongifs"
           "reallifedoodles"
+          "RetroFuturism"
           "robotsbeingjerks"
           "scriptedasiangifs"
           "shitposting"
@@ -99,9 +97,11 @@ with import <stockholm/lib>;
           "stupidfood"
           "techsupportgore"
           "thathappened"
+          "ThingsCutInHalfPorn"
           "totallynotrobots"
           "trippinthroughtime"
           "unexpected"
+          "Unexpected"
           "wasletztepreis"
           "wellthatsucks"
           "wewantplates"
-- 
cgit v1.2.3


From b1068cadc4458d91889b7ede847829af33d2b145 Mon Sep 17 00:00:00 2001
From: Felix <git@flx.ai>
Date: Tue, 15 Mar 2022 22:04:00 +0100
Subject: l nichtparasoup: enrich reddit experience

---
 lass/3modules/nichtparasoup.nix | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/lass/3modules/nichtparasoup.nix b/lass/3modules/nichtparasoup.nix
index 37b55ad2d..c18c942d1 100644
--- a/lass/3modules/nichtparasoup.nix
+++ b/lass/3modules/nichtparasoup.nix
@@ -25,20 +25,26 @@ with import <stockholm/lib>;
         SoupIO: everyone
         Pr0gramm: new,top
         Reddit: ${lib.concatStringsSep "," [
+          "2healthbars"
           "abandonedporn"
           "animalsbeingderps"
           "ANormalDayInRussia"
           "assholedesign"
+          "AwesomeOffBrands"
           "bizarrebuildings"
           "bonehurtingjuice"
           "boottoobig"
           "bossfight"
+          "bravofotogeschichten"
+          "breathinginformation"
           "buddhistmemes"
           "cablefail"
           "cableporn"
           "catastrophicfailure"
           "chairsunderwater"
           "clevercomebacks"
+          "confusingperspective"
+          "conni"
           "crappydesign"
           "cursedcomments"
           "desirepath"
@@ -50,48 +56,66 @@ with import <stockholm/lib>;
           "forbiddensnacks"
           "funnyanimals"
           "gifs"
+          "Gittertiere"
+          "goodboomerhumor"
           "grssk"
+          "halthoch"
           "hmm"
+          "hmmm"
           "holdmybeer"
           "holup"
           "iamatotalpieceofshit"
           "ichbin40undlustig"
           "idiotsincars"
           "illegallysmolcats"
+          "infokriegerkutschen"
           "instagramreality"
           "instant_regret"
+          "itrunsdoom"
           "itsaunixsystem"
           "kamikazebywords"
           "keming"
           "kidsarefuckingstupid"
           "kitchenconfidential"
           "laughingbuddha"
+          "LiminalSpace"
           "loadingicon"
+          "MachinePorn"
+          "mallninjashit"
           "michaelbaygifs"
           "mildlyinfuriating"
+          "miscatculations"
           "natureisfuckinglit"
           "nononoyesno"
           "notinteresting"
           "notliketheothergirls"
           "oddlysatisfying"
           "ofcoursethatsathing"
+          "okbuddylinux"
           "OSHA"
           "PeopleFuckingDying"
+          "Perfectfit"
           "perfectloops"
           "PerfectTiming"
           "picsofunusualbirds"
           "PixelArt"
           "pizzacrimes"
           "prequelmemes"
+          "Prisonwallet"
           "reactiongifs"
+          "RealFakeDoors"
           "reallifedoodles"
           "RetroFuturism"
           "robotsbeingjerks"
+          "SchizophreniaRides"
           "scriptedasiangifs"
           "shitposting"
           "shittyfoodporn"
           "shittyrobots"
           "softwaregore"
+          "specializedtools"
+          "spicypillows"
+          "StallmanWasRight"
           "startledcats"
           "startrekstabilized"
           "stupidfood"
@@ -100,10 +124,11 @@ with import <stockholm/lib>;
           "ThingsCutInHalfPorn"
           "totallynotrobots"
           "trippinthroughtime"
-          "unexpected"
           "Unexpected"
+          "urbanexploration"
           "wasletztepreis"
           "wellthatsucks"
+          "wertekinder"
           "wewantplates"
           "whatcouldgowrong"
           "whatsthisbug"
-- 
cgit v1.2.3


From 291e9f940ce8b294031c4c3a56fde960042ccba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Wed, 16 Mar 2022 16:18:03 +0100
Subject: external: add tahina.r

---
 krebs/3modules/external/kmein.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/krebs/3modules/external/kmein.nix b/krebs/3modules/external/kmein.nix
index 6e4457eae..52ca718dd 100644
--- a/krebs/3modules/external/kmein.nix
+++ b/krebs/3modules/external/kmein.nix
@@ -116,6 +116,28 @@ in
         wireguard.pubkey = "09yVPHL/ucvqc6V5n7vFQ2Oi1LBMdwQZDL+7jBwy+iQ=";
       };
     };
+    tahina = {
+      nets.retiolum = {
+        ip4.addr = "10.243.2.74";
+        aliases = [ "tahina.r" "tahina.kmein.r" ];
+        tinc.pubkey = ''
+          -----BEGIN RSA PUBLIC KEY-----
+          MIICCgKCAgEAtX6RpdFl9AqCF6Jy9ZhGY1bOUnEw5x3wm8gBK/aFb5592G3sGbWV
+          5Vv1msdLcoYQ5X4sgp3wizE5tbW7SiRVBwVB4mfYxe5KSiFJvTmXdp/VtKXs/hD8
+          VXNBjCdPeFOZ4Auh4AT+eibA/lW5veOnBkrsD/GkEcAkKb2MMEoxv4VqLDKuNzPv
+          EfE+mIb/J3vJmfpLG/+VGLrCuyShjPR2z0o5KMg8fI4ukcg6vwWwGE3Qd8JkSYMz
+          iy9oIGo/AJNyOUG0vQXL1JU/LFBXKty515UmXR2hO/Xi1w92DT8lxfLYRgoseT2u
+          i4aHmfl49LGkpQVIFejj6R0FrZBd5R2ElmQbmxSKS1PO9VheOOm02fgVXRpeoh6R
+          FdDkFWWmELW921UtEB2jSIMkf5xW8XmlJlGveaDnkld07aQlshnnOUfIs3r7H+T9
+          9g1QxiE7EFeoLrfIkgT81F+iL6RazSbf9DcTxvrKv+cZBrZKdcurcTtX0wFFD4wZ
+          0tzYPTcAnv/ytacf2/jv/Vm3xNFyjrBLM6ZtJtZ6NAJvD+OW4G/o2941KCu1Mqz/
+          VFAJW3djrqfASNCU1GqtHV0wdJMN8EszDNYdJ7pyw6+rG2PeYCVfE7wNe3b6zYqY
+          tUYhU1xkQQD4xgOMX3AdSI/JGjxMBBKlJXafwdDW8LMBWBPt+9Xq2vMCAwEAAQ==
+          -----END RSA PUBLIC KEY-----
+        '';
+        tinc.pubkey_ed25519 = "m8fnOzCx2KVsQx/616+AzVW5OTgAjBGDoT/PpKuyx+I";
+      };
+    };
     zaatar = {
       nets.retiolum = {
         ip4.addr = "10.243.2.34";
-- 
cgit v1.2.3


From d51c1c93a07fbe41e8bbaedb2e4fb7ff39824c9d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 18 Mar 2022 13:28:12 +0100
Subject: tv file-line: git -> https

---
 tv/5pkgs/vim/file-line.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tv/5pkgs/vim/file-line.nix b/tv/5pkgs/vim/file-line.nix
index 22597265a..0509cc4a0 100644
--- a/tv/5pkgs/vim/file-line.nix
+++ b/tv/5pkgs/vim/file-line.nix
@@ -3,7 +3,7 @@
 pkgs.vimUtils.buildVimPlugin {
   name = "file-line-1.0";
   src = pkgs.fetchgit {
-    url = git://github.com/bogado/file-line;
+    url = https://github.com/bogado/file-line;
     rev = "refs/tags/1.0";
     sha256 = "0z47zq9rqh06ny0q8lpcdsraf3lyzn9xvb59nywnarf3nxrk6hx0";
   };
-- 
cgit v1.2.3


From 6c826001614f78bac48d751a1c03c62bb98b8f05 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 18 Mar 2022 16:01:57 +0100
Subject: git-hooks irc-announce: add verbose blacklist

---
 krebs/5pkgs/simple/git-hooks/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/krebs/5pkgs/simple/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix
index c9dcc7541..13fe7aa67 100644
--- a/krebs/5pkgs/simple/git-hooks/default.nix
+++ b/krebs/5pkgs/simple/git-hooks/default.nix
@@ -96,7 +96,12 @@ with stockholm.lib;
       #$host $GIT_SSH_REPO $ref $link
       add_message $(pink push) $link $(gray "($receive_mode)")
 
-      ${optionalString verbose /* sh */ ''
+      ${optionalString (verbose == false || typeOf verbose == "set") /* sh */ ''
+        ${optionalString (verbose.exclude or [] != []) /* sh */ ''
+          case $ref in (${concatStringsSep "|" verbose.exclude})
+            continue
+          esac
+        ''}
         add_message "$(
           git log \
               --format="$(orange %h) %s $(gray '(%ar)')" \
-- 
cgit v1.2.3


From 2dd6f092224ba5806c206f23ddff4e978c27d1e1 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 18 Mar 2022 16:08:08 +0100
Subject: tv gitrepos: don't announce head verbosely

---
 tv/2configs/gitrepos.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index fc76e5fd6..4d22fdff5 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -188,7 +188,11 @@ let {
     # TODO make nick = config.krebs.build.host.name the default
     nick = config.krebs.build.host.name;
     server = "irc.r";
-    verbose = true;
+    verbose = {
+      exclude = [
+        "refs/heads/head"
+      ];
+    };
   } args);
 
   make-public-repo = name: { cgit ? {}, ... }: {
-- 
cgit v1.2.3


From 32c9720ca46537af4715245797b78734e6a762d0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 18 Mar 2022 13:48:56 +0100
Subject: lib: add evalModulesConfig

---
 lib/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/default.nix b/lib/default.nix
index 94a81439e..55cf1765e 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -2,6 +2,12 @@ let
   nixpkgs-lib = import <nixpkgs/lib>;
   lib = with lib; nixpkgs-lib // builtins // {
 
+    evalModulesConfig = modules: let
+      eval = evalModules {
+        inherit modules;
+      };
+    in filterAttrsRecursive (name: _: !hasPrefix "_" name) eval.config;
+
     evalSource = import ./eval-source.nix;
 
     git = import ./git.nix { inherit lib; };
-- 
cgit v1.2.3


From 5903fb0b61e6e6524dd3bbdfaa81b7775a134304 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 18 Mar 2022 13:49:07 +0100
Subject: lib: add evalSubmodule

---
 lib/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/default.nix b/lib/default.nix
index 55cf1765e..7c3b0370e 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -10,6 +10,15 @@ let
 
     evalSource = import ./eval-source.nix;
 
+    evalSubmodule = submodule: modules: let
+      prefix = ["evalSubmodule"];
+    in evalModulesConfig [
+      {
+        options = removeAttrs (submodule.getSubOptions prefix) ["_module"];
+        imports = modules;
+      }
+    ];
+
     git = import ./git.nix { inherit lib; };
     haskell = import ./haskell.nix { inherit lib; };
     krebs = import ./krebs lib;
-- 
cgit v1.2.3


From e008a493e0fc0d0418fdc703535e473d6f089d04 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 18 Mar 2022 13:50:37 +0100
Subject: tv: hostDefaults -> evalHost

---
 krebs/3modules/tv/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index e096118c6..132a3c4be 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -1,11 +1,13 @@
 with import <stockholm/lib>;
 { config, ... }: let
 
-  hostDefaults = hostName: host: foldl' recursiveUpdate {} [
+  evalHost = hostName: hostConfig: evalSubmodule types.host [
+    hostConfig
     {
+      name = hostName;
       owner = config.krebs.users.tv;
     }
-    (optionalAttrs (host.nets?retiolum) {
+    (optionalAttrs (hostConfig.nets?retiolum) {
       nets.retiolum = {
         ip6.addr =
           (krebs.genipv6 "retiolum" "tv" { inherit hostName; }).address;
@@ -23,14 +25,13 @@ with import <stockholm/lib>;
         wireguard.pubkey = readFile pubkey-path;
       };
     })
-    host
   ];
 
 in {
   dns.providers = {
     "viljetic.de" = "regfish";
   };
-  hosts = mapAttrs hostDefaults {
+  hosts = mapAttrs evalHost {
     alnus = {
       ci = true;
       cores = 2;
-- 
cgit v1.2.3


From f063c85ed03c9a9c6b2cd6f916da3e37a26facda Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 18 Mar 2022 13:51:49 +0100
Subject: tv: allow hosts without nets

---
 krebs/3modules/tv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 132a3c4be..615ac7ea2 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -7,7 +7,7 @@ with import <stockholm/lib>;
       name = hostName;
       owner = config.krebs.users.tv;
     }
-    (optionalAttrs (hostConfig.nets?retiolum) {
+    (optionalAttrs (hasAttrByPath ["nets" "retiolum"] hostConfig) {
       nets.retiolum = {
         ip6.addr =
           (krebs.genipv6 "retiolum" "tv" { inherit hostName; }).address;
-- 
cgit v1.2.3


From 519648574e85fe02550092eaa76298e62568b655 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 18 Mar 2022 14:14:23 +0100
Subject: tv: derive ssh.privkey.path

---
 krebs/3modules/tv/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 615ac7ea2..6c268d72c 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -25,6 +25,12 @@ with import <stockholm/lib>;
         wireguard.pubkey = readFile pubkey-path;
       };
     })
+    (host: mkIf (host.config.ssh.pubkey != null) {
+      ssh.privkey = mapAttrs (const mkDefault) {
+        path = config.krebs.secret.file "ssh.id_${host.config.ssh.privkey.type}";
+        type = head (toList (match "ssh-([^ ]+) .*" host.config.ssh.pubkey));
+      };
+    })
   ];
 
 in {
@@ -54,7 +60,6 @@ in {
           tinc.pubkey_ed25519 = "Td6pRkmSzSGVJll26rULdr6W4U87xsHZ/87NEaglW3K";
         };
       };
-      ssh.privkey.path = config.krebs.secret.file "ssh.id_rsa";
       ssh.pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDP9JS2Nyjx4Pn+/4MrFi1EvBBYVKkGm2Q4lhgaAiSuiGLol53OSsL2KIo01mbcSSBWow9QpQpn8KDoRnT2aMLDrdTFqL20ztDLOXmtrSsz3flgCjmW4f6uOaoZF0RNjAybd1coqwSJ7EINugwoqOsg1zzN2qeIGKYFvqFIKibYFAnQ8hcksmkvPdIO5O8CbdIiP9sZSrSDp0ZyLK2T0PML2jensVZOeqSPulQDFqLsbmavpVLkpDjdzzPRwbZWNB4++YeipbYNOkX4GR1EB4wMZ93IbBV7kpJtib2Zb2AnUf7UW37hxWBjILdstj9ClwNOQggn8kD9ub7YxBzH1dz0Xd8a0mPOAWIDJz9MypXgFRc3vdvPB/W1I4Se0CLbgOkORun9CkgijKr9oEY8JNt8HFd6viZcAaQxOyIm6PNHZTnHfdSc7bIBS2n3e3IZBv0fTd77knGLXg402aTuu2bm/kxsKivxsILXIaGbeXe4ceN3Fynr3FzSM2bUkzHb0mAHu1BQ9YaX0xzCwjVueA5nzGls7ODSFkXsiBfg2FvMN/sTLFca6tnwyqcnD6nujoiS5+BxjDWPgnZYqCaW3B/IkpTsRMsX6QrfhOFcsP8qlJ2Cp82orWoDK/D0vZ9pdzAc6PFGga0RofuJKY2yiq+SRZ7/e9E6VncIVCYZ1OfN0Q==";
     };
     au = {
@@ -80,7 +85,6 @@ in {
         };
       };
       secure = true;
-      ssh.privkey.path = config.krebs.secret.file "ssh.id_ed25519";
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBsqDuhGJpjpqNv4QmjoOhcODObrPyY3GHLvtVkgXV0g root@au";
     };
     bu = {
@@ -130,7 +134,6 @@ in {
         };
       };
       secure = true;
-      ssh.privkey.path = config.krebs.secret.file "ssh.id_ed25519";
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO+Rrf9tvuusYlnSZwUiHS4O+AhrpVZ/6n7peSRKojTc root@hu";
     };
     mu = {
@@ -155,7 +158,6 @@ in {
           tinc.pubkey_ed25519 = "cEf/Kq/2Fo70yoIcVmhIp4it9eA7L3GdkgrVE9AWU6C";
         };
       };
-      ssh.privkey.path = config.krebs.secret.file "ssh.id_ed25519";
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM1vJsAddvxMA84u9iJEOrIkKn7pQiemMbfW5cfK1d7g root@mu";
     };
     ni = {
@@ -235,7 +237,6 @@ in {
         };
       };
       secure = true;
-      ssh.privkey.path = config.krebs.secret.file "ssh.id_ed25519";
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMIHmwXHV7E9UGuk4voVCADjlLkyygqNw054jvrsPn5t root@nomic";
     };
     wu = {
@@ -262,7 +263,6 @@ in {
         };
       };
       secure = true;
-      ssh.privkey.path = config.krebs.secret.file "ssh.id_ed25519";
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcJvu8JDVzObLUtlAQg9qVugthKSfitwCljuJ5liyHa";
     };
     querel = {
@@ -291,7 +291,6 @@ in {
           '';
         };
       };
-      ssh.privkey.path = <secrets/ssh.id_ed25519>;
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPFM2GdL9yOjSBmYBE07ClywNOADc/zxqXwZuWd7Mael root@querel.r";
     };
     xu = {
@@ -322,7 +321,6 @@ in {
         };
       };
       secure = true;
-      ssh.privkey.path = config.krebs.secret.file "ssh.id_ed25519";
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPnjfceKuHNQu7S4eYFN1FqgzMqiL7haNZMh2ZLhvuhK root@xu";
     };
     zu = {
@@ -347,7 +345,6 @@ in {
         };
       };
       secure = true;
-      ssh.privkey.path = <secrets/ssh.id_rsa>;
       ssh.pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDNjHxyUC7afNGSwfwBfQizmDnHTNLWDRHE8SY9W4oiw2lPhCFGTN8Jz84CKtnABbZhbNY1E8T58emF2h45WzDg/OGi8DPAk4VsXSkIhyvAto+nkTy2L4atjqfvXDvqxTDC9sui+t8p5OqOK+sghe4kiy+Vx1jhnjSnkQsx9Kocu24BYTkNqYxG7uwOz6t262XYNwMn13Y2K/yygDR3Uw3wTnEjpaYnObRxxJS3iTECDzgixiQ6ewXwYNggpzO/+EfW1BTz5vmuEVf4GbQ9iEc7IsVXHhR+N0boCscvSgae9KW9MBun0A2veRFXNkkfBEMfzelz+S63oeVfelkBq6N5aLsHYYGC4VQjimScelHYVwxR7O4fV+NttJaFF7H06FJeFzPt3NYZeoPKealD5y2Muh1UnewpmkMgza9hQ9EmI4/G1fMowqeMq0U6Hu0QMDUAagyalizN97AfsllY2cs0qLNg7+zHMPwc5RgLzs73oPUsF3umz0O42I5p5733vveUlWi5IZeI8CA1ZKdpwyMXXNhIOHs8u+yGsOLfSy3RgjVKp2GjN4lfnFd0LI+p7iEsEWDRkIAvGCOFepsebyVpBjGP+Kqs10bPGpk5dMcyn9iBJejoz9ka+H9+JAG04LnXwt6Rf1CRV3VRCRX1ayZEjRv9czV7U9ZpuFQcIlVRJQ== root@zu";
     };
     umz = {
-- 
cgit v1.2.3


From 2ad9dc3617862d60cd9af4186741a767a7a28c6f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 22 Mar 2022 00:57:44 +0100
Subject: lib.haskell.substitutePkgs: fix typo

---
 lib/haskell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/haskell.nix b/lib/haskell.nix
index b1889caf0..2143e9a32 100644
--- a/lib/haskell.nix
+++ b/lib/haskell.nix
@@ -35,7 +35,7 @@ rec {
               "${pkg}/bin/${exename}"
             else
               trace (toString [
-                "lib.haskell.replacePkg:"
+                "lib.haskell.substitutePkgs:"
                 "warning:"
                 "while deriving ${sourceDescription}:"
                 "no substitute found for ${elemAt parse 1}"
-- 
cgit v1.2.3


From 44ec31fe02c282660be239f3a7899b62f56ab4d3 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 22 Mar 2022 00:55:53 +0100
Subject: lib.haskell.substitutePkgs: add dependencies

---
 lib/haskell.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/haskell.nix b/lib/haskell.nix
index 2143e9a32..4f0ee05ab 100644
--- a/lib/haskell.nix
+++ b/lib/haskell.nix
@@ -9,19 +9,14 @@ rec {
   # "${pkgs.bar}/bin/foo" for each {-pkg:bar-}"foo".
   # If a package doesn't exist, a warning gets printed.
   substitutePkgs = name: { callsite ? null, pkgs, path }:
-    pkgs.writeText name (substitutePkgs' {
-      inherit pkgs;
+    let
       sourceDescription =
         if callsite != null then
           "${name} in ${toString callsite}"
         else
           "${name} from ${toString path}";
-      text = readFile path;
-    });
 
-  substitutePkgs' = { pkgs, sourceDescription, text }:
-    let
-      f = s:
+      f = dependencies: s:
         let
           parse = match "(.*)([{]-pkg(:([^}]+))?-[}]\"([^\"]+)\")(.*)" s;
           prefix = elemAt parse 0;
@@ -43,9 +38,12 @@ rec {
               exename;
         in
         if parse == null then
-          s
+          (pkgs.writeText name s).overrideAttrs (old: {
+            dependencies = old.dependencies or [] ++ dependencies;
+          })
+
         else
-          f (prefix + toJSON substitute + suffix);
+          f (dependencies ++ [pkg]) (prefix + toJSON substitute + suffix);
     in
-    f text;
+    f [] (readFile path);
 }
-- 
cgit v1.2.3


From 1fc622cd0835882d4d565f216af72e2881815b7b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 22 Mar 2022 19:34:57 +0100
Subject: qrscan: use new one shot scanning mode

---
 krebs/5pkgs/simple/qrscan.nix | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/krebs/5pkgs/simple/qrscan.nix b/krebs/5pkgs/simple/qrscan.nix
index 7d99dcee7..df9a98053 100644
--- a/krebs/5pkgs/simple/qrscan.nix
+++ b/krebs/5pkgs/simple/qrscan.nix
@@ -1,27 +1,7 @@
-{ coreutils, gnused, writeDashBin, zbar }:
+{ pkgs }:
 
-writeDashBin "qrscan" ''
+pkgs.writeDashBin "qrscan" ''
   set -efu
 
-  tmpdir=$(${coreutils}/bin/mktemp --tmpdir -d qrscan.XXXXXXXX)
-  codefile=$tmpdir/code
-
-  cleanup() {
-    ${coreutils}/bin/rm "$codefile"
-    ${coreutils}/bin/rmdir "$tmpdir"
-  }
-
-  ${coreutils}/bin/mkfifo "$codefile"
-
-  ${zbar}/bin/zbarcam > "$codefile" &
-  zbarcampid=$!
-
-  exec < "$codefile"
-  while read -r code; do
-    code=$(printf %s "$code" | ${gnused}/bin/sed -n 's/^QR-Code://p')
-    if test -n "$code"; then
-      ${coreutils}/bin/kill "$zbarcampid"
-      echo "$code"
-    fi
-  done
+  ${pkgs.zbar}/bin/zbarcam -1 | ${pkgs.gnused}/bin/sed -n 's/^QR-Code://p'
 ''
-- 
cgit v1.2.3


From 84801ef88c63c9bfc5752066e461c96bc0e8c68b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 22 Mar 2022 20:09:06 +0100
Subject: tv: <stockholm> -> ../../..

---
 krebs/3modules/tv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 6c268d72c..965505a75 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ../../../lib;
 { config, ... }: let
 
   evalHost = hostName: hostConfig: evalSubmodule types.host [
-- 
cgit v1.2.3


From 89ed260092679d4fd664fd4b51850f7685ccd3bc Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 23 Mar 2022 10:54:12 +0100
Subject: nixpkgs: 47cd670 -> 31aa631

---
 krebs/nixpkgs.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index e7760128f..62391dbf0 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "47cd6702934434dd02bc53a67dbce3e5493e33a2",
-  "date": "2022-03-04T16:09:08+01:00",
-  "path": "/nix/store/xbb640k873m7nmchdrnijl0f9n540ys6-nixpkgs",
-  "sha256": "1rvp9gx7n0gppc86bcysaybw79zl3y8yninsgz6rawdjprzvg7y6",
+  "rev": "31aa631dbc496500efd2507baaed39626f6650f2",
+  "date": "2022-03-21T15:39:15-07:00",
+  "path": "/nix/store/zdzdalfl2ksb5vlrj1jcqkf6jgvrfhwf-nixpkgs",
+  "sha256": "08qaraj9j7m2g1ldhpkg8ksylk7s00mr7khkzif0m8jshkq8j92b",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-- 
cgit v1.2.3


From 3439fc0a683a8de01933507e4db9d2494ef7f970 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 23 Mar 2022 10:54:32 +0100
Subject: nixpkgs-unstable: 7f9b6e2 -> 9bc841f

---
 krebs/nixpkgs-unstable.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json
index 71367c2f1..b8d5c6d01 100644
--- a/krebs/nixpkgs-unstable.json
+++ b/krebs/nixpkgs-unstable.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d",
-  "date": "2022-02-21T09:47:16+01:00",
-  "path": "/nix/store/4vd9z4b2s4jfn96ypdfavizy6908l71h-nixpkgs",
-  "sha256": "03nb8sbzgc3c0qdr1jbsn852zi3qp74z4qcy7vrabvvly8rbixp2",
+  "rev": "9bc841fec1c0e8b9772afa29f934d2c7ce57da8e",
+  "date": "2022-03-20T19:18:44+01:00",
+  "path": "/nix/store/zqxcjhw0x555zaxn55qnaszkabk1r4vi-nixpkgs",
+  "sha256": "0hh1gpw3lcacz3qba7pcc7j1vc09gawa4lzff3mkgsrmp732hg5f",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-- 
cgit v1.2.3


From b831edf9efad11f2a8d49c58e302b8f05b72c95a Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 23 Mar 2022 11:51:59 +0100
Subject: l pipewire: pulseaudioLight -> pulseaudio

---
 lass/2configs/pipewire.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lass/2configs/pipewire.nix b/lass/2configs/pipewire.nix
index 24de0e9ed..74da44bd7 100644
--- a/lass/2configs/pipewire.nix
+++ b/lass/2configs/pipewire.nix
@@ -10,7 +10,7 @@
 
   environment.systemPackages = with pkgs; [
     alsaUtils
-    pulseaudioLight
+    pulseaudio
     ponymix
   ];
 
-- 
cgit v1.2.3


From 1877cadb9687456b8ed571bbc44612509fc958f2 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 23 Mar 2022 11:52:41 +0100
Subject: l mors.r: foomatic_filters -> foomatic-filters

---
 lass/2configs/print.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lass/2configs/print.nix b/lass/2configs/print.nix
index e2d021641..c2b3e8377 100644
--- a/lass/2configs/print.nix
+++ b/lass/2configs/print.nix
@@ -3,7 +3,7 @@
   services.printing = {
     enable = true;
     drivers = [
-      pkgs.foomatic_filters
+      pkgs.foomatic-filters
       pkgs.gutenprint
     ];
   };
-- 
cgit v1.2.3


From d6202b1417b67666ba0cb6255b5353204bc21829 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 23 Mar 2022 14:34:06 +0100
Subject: l xmonad: pulseaudioLight -> pulseaudio

---
 lass/2configs/xmonad.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lass/2configs/xmonad.nix b/lass/2configs/xmonad.nix
index 099900d90..495b43372 100644
--- a/lass/2configs/xmonad.nix
+++ b/lass/2configs/xmonad.nix
@@ -123,9 +123,9 @@ myKeyMap =
 
     , ("M4-S-q", restart "xmonad" True)
 
-    , ("<XF86AudioMute>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-mute @DEFAULT_SINK@ toggle")
-    , ("<XF86AudioRaiseVolume>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume @DEFAULT_SINK@ +4%")
-    , ("<XF86AudioLowerVolume>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume @DEFAULT_SINK@ -4%")
+    , ("<XF86AudioMute>", spawn "${pkgs.pulseaudio.out}/bin/pactl -- set-sink-mute @DEFAULT_SINK@ toggle")
+    , ("<XF86AudioRaiseVolume>", spawn "${pkgs.pulseaudio.out}/bin/pactl -- set-sink-volume @DEFAULT_SINK@ +4%")
+    , ("<XF86AudioLowerVolume>", spawn "${pkgs.pulseaudio.out}/bin/pactl -- set-sink-volume @DEFAULT_SINK@ -4%")
     , ("<XF86MonBrightnessDown>", spawn "${pkgs.acpilight}/bin/xbacklight -time 0 -dec 1")
     , ("<XF86MonBrightnessUp>",   spawn "${pkgs.acpilight}/bin/xbacklight -time 0 -inc 1")
     , ("M4-C-k", spawn "${pkgs.xorg.xkill}/bin/xkill")
-- 
cgit v1.2.3


From 6b4b555a583933e5428c561f4f861932fd2a8850 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 23 Mar 2022 14:49:58 +0100
Subject: l baseX: ag -> ripgrep

---
 lass/2configs/baseX.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 59d1e0182..8680c5ae3 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -55,7 +55,7 @@ in {
   environment.systemPackages = with pkgs; [
     acpi
     acpilight
-    ag
+    ripgrep
     cabal2nix
     dic
     dmenu
-- 
cgit v1.2.3


From ba8a0d000ae7b731f7961a8af47b811a881b73a7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 23 Mar 2022 15:05:42 +0100
Subject: netcat-openbsd -> libressl.nc

---
 krebs/2configs/mud.nix                   | 2 +-
 krebs/5pkgs/simple/untilport/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/krebs/2configs/mud.nix b/krebs/2configs/mud.nix
index 30f232b64..a53596cc6 100644
--- a/krebs/2configs/mud.nix
+++ b/krebs/2configs/mud.nix
@@ -5,7 +5,7 @@
     MUD_SERVER=''${MUD_SERVER:-127.0.0.1}
     MUD_PORT=''${MUD_PORT:-8080}
 
-    if $(${pkgs.netcat-openbsd}/bin/nc -z "$MUD_SERVER" "$MUD_PORT"); then
+    if $(${pkgs.libressl.nc}/bin/nc -z "$MUD_SERVER" "$MUD_PORT"); then
       ${nvim}/bin/nvim \
         +"let g:instant_username = \"$MUD_NICKNAME\"" \
         +":InstantJoinSession $MUD_SERVER $MUD_PORT" \
diff --git a/krebs/5pkgs/simple/untilport/default.nix b/krebs/5pkgs/simple/untilport/default.nix
index 61bcc2b89..2930fd1eb 100644
--- a/krebs/5pkgs/simple/untilport/default.nix
+++ b/krebs/5pkgs/simple/untilport/default.nix
@@ -13,6 +13,6 @@ pkgs.writeDashBin "untilport" ''
   if [ $# -ne 2 ]; then
     usage
   else
-    until ${pkgs.netcat-openbsd}/bin/nc -z "$@"; do sleep 1; done
+    until ${pkgs.libressl.nc}/bin/nc -z "$@"; do sleep 1; done
   fi
 ''
-- 
cgit v1.2.3


From 48090639ed5f9549d9bdcc1940668b7ba3a9e6bf Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 23 Mar 2022 15:20:01 +0100
Subject: l wireguard -> wireguard-tools

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

diff --git a/lass/5pkgs/l-gen-secrets/default.nix b/lass/5pkgs/l-gen-secrets/default.nix
index 6cf28c3c2..d999a4334 100644
--- a/lass/5pkgs/l-gen-secrets/default.nix
+++ b/lass/5pkgs/l-gen-secrets/default.nix
@@ -8,8 +8,8 @@ pkgs.writeDashBin "l-gen-secrets" ''
   ${pkgs.openssh}/bin/ssh-keygen -t ed25519 -f $TMPDIR/ssh.id_ed25519 -P "" -C "" >/dev/null
   ${pkgs.openssl}/bin/openssl genrsa -out $TMPDIR/retiolum.rsa_key.priv 4096 2>/dev/null > /dev/null
   ${pkgs.openssl}/bin/openssl rsa -in $TMPDIR/retiolum.rsa_key.priv -pubout -out $TMPDIR/retiolum.rsa_key.pub 2>/dev/null > /dev/null
-  ${pkgs.wireguard}/bin/wg genkey > $TMPDIR/wiregrill.key
-  ${pkgs.coreutils}/bin/cat $TMPDIR/wiregrill.key | ${pkgs.wireguard}/bin/wg pubkey > $TMPDIR/wiregrill.pub
+  ${pkgs.wireguard-tools}/bin/wg genkey > $TMPDIR/wiregrill.key
+  ${pkgs.coreutils}/bin/cat $TMPDIR/wiregrill.key | ${pkgs.wireguard-tools}/bin/wg pubkey > $TMPDIR/wiregrill.pub
   cat <<EOF > $TMPDIR/hashedPasswords.nix
   {
     root = "$HASHED_PASSWORD";
-- 
cgit v1.2.3


From 5f317cd595232cbe9729f0ccbde7501f759d66c7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 23 Mar 2022 15:50:55 +0100
Subject: l baseX: use new fonts config

---
 lass/2configs/baseX.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 8680c5ae3..249410371 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -96,12 +96,17 @@ in {
     '')
   ];
 
-  fonts.fonts = with pkgs; [
-    hack-font
-    hasklig
-    symbola
-    xlibs.fontschumachermisc
-  ];
+  fonts = {
+    fontDir.enable = true;
+    enableGhostscriptFonts = true;
+
+    fonts = with pkgs; [
+      hack-font
+      xorg.fontschumachermisc
+      terminus_font_ttf
+      inconsolata
+    ];
+  };
 
   services.udev.extraRules = ''
     SUBSYSTEM=="backlight", ACTION=="add", \
-- 
cgit v1.2.3


From d2556cf5c7d6cc03c12b4ec553e1411c90b3e00e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 23 Mar 2022 17:03:58 +0100
Subject: l pipwire: add wireplumber workaround for systemWide

---
 lass/2configs/pipewire.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lass/2configs/pipewire.nix b/lass/2configs/pipewire.nix
index 74da44bd7..f6ccd48d4 100644
--- a/lass/2configs/pipewire.nix
+++ b/lass/2configs/pipewire.nix
@@ -22,4 +22,15 @@
     pulse.enable = true;
     jack.enable = true;
   };
+
+  systemd.services.wireplumber = {
+    environment = {
+      HOME = "/var/lib/wireplumber";
+      DISPLAY = ":0";
+    };
+    path = [
+      pkgs.dbus
+    ];
+    serviceConfig.StateDirectory = "wireplumber";
+  };
 }
-- 
cgit v1.2.3


From b14ccba40fdb228859f93ce349aa48905ecdf835 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 25 Mar 2022 13:43:44 +0100
Subject: l hass: add pyscript dev environment

---
 lass/2configs/hass/default.nix          |  1 +
 lass/2configs/hass/pyscript/.gitignore  |  1 +
 lass/2configs/hass/pyscript/default.nix | 26 +++++++++++++++++
 lass/2configs/hass/pyscript/shell.nix   | 51 +++++++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+)
 create mode 100644 lass/2configs/hass/pyscript/.gitignore
 create mode 100644 lass/2configs/hass/pyscript/default.nix
 create mode 100644 lass/2configs/hass/pyscript/shell.nix

diff --git a/lass/2configs/hass/default.nix b/lass/2configs/hass/default.nix
index 8f93e0cec..cc8189f51 100644
--- a/lass/2configs/hass/default.nix
+++ b/lass/2configs/hass/default.nix
@@ -19,6 +19,7 @@ let
 
 in {
   imports = [
+    ./pyscript
     ./zigbee.nix
     ./rooms/bett.nix
     ./rooms/essen.nix
diff --git a/lass/2configs/hass/pyscript/.gitignore b/lass/2configs/hass/pyscript/.gitignore
new file mode 100644
index 000000000..282debf56
--- /dev/null
+++ b/lass/2configs/hass/pyscript/.gitignore
@@ -0,0 +1 @@
+hass_token
diff --git a/lass/2configs/hass/pyscript/default.nix b/lass/2configs/hass/pyscript/default.nix
new file mode 100644
index 000000000..c56967e4b
--- /dev/null
+++ b/lass/2configs/hass/pyscript/default.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+{
+  systemd.tmpfiles.rules = [
+    "L+ /var/lib/hass/custom_components/pyscript - - - - ${pkgs.fetchzip {
+      url = "https://github.com/custom-components/pyscript/releases/download/1.3.2/hass-custom-pyscript.zip";
+      sha256 = "0cqdjj46s5xp4mqxb0ic790jm1xp3z0zr2n9f7bsfl5zpvdshl8z";
+      stripRoot = false;
+    }}"
+  ];
+
+  services.home-assistant = {
+    package = (pkgs.home-assistant.overrideAttrs (old: {
+      doInstallCheck = false;
+    })).override {
+      extraPackages = pp: [ pp.croniter ];
+    };
+    config.pyscript = {
+      allow_all_imports = true;
+      hass_is_global = true;
+    };
+  };
+
+  networking.firewall.interfaces.retiolum.allowedTCPPortRanges = [
+    { from = 50321; to = 50341; } # for ipython interactive debugging
+  ];
+}
diff --git a/lass/2configs/hass/pyscript/shell.nix b/lass/2configs/hass/pyscript/shell.nix
new file mode 100644
index 000000000..3cfac0275
--- /dev/null
+++ b/lass/2configs/hass/pyscript/shell.nix
@@ -0,0 +1,51 @@
+{ pkgs ? import <nixpkgs> {} }: let
+
+  hass_host = "styx.r";
+  hass_token = builtins.readFile ./hass_token;
+
+  mach-nix = import (builtins.fetchGit {
+    url = "https://github.com/DavHau/mach-nix/";
+    ref = "refs/tags/3.4.0";
+  }) {
+    pkgs = pkgs;
+  };
+  pyenv = mach-nix.mkPython {
+    requirements = ''
+      hass_pyscript_kernel
+    '';
+  };
+  jupyter = import (builtins.fetchGit {
+    url = https://github.com/tweag/jupyterWith;
+    ref = "master";
+  }) {};
+
+  pyscriptKernel = {
+    spec = pkgs.runCommand "pyscript" {} ''
+      mkdir -p $out/kernels/pyscript
+      cp ${kernel_json} $out/kernels/pyscript/kernel.json
+      cp ${pyscript_conf} $out/kernels/pyscript/pyscript.conf
+    '';
+    runtimePackages = [ pyenv ];
+  };
+
+  kernel_json = pkgs.writeText "kernel.json" (builtins.toJSON {
+    argv = [
+      "${pyenv}/bin/python3" "-m" "hass_pyscript_kernel"
+      "-f" "{connection_file}"
+    ];
+    display_name = "hass_pyscript";
+    language = "python";
+  });
+
+  pyscript_conf = pkgs.writeText "pyscript.conf" ''
+    [homeassistant]
+    hass_host = ${hass_host}
+    hass_url = http://''${hass_host}:8123
+    hass_token = ${hass_token}
+  '';
+
+  jupyterEnvironment = jupyter.jupyterlabWith {
+    kernels = [ pyscriptKernel ];
+  };
+
+in jupyterEnvironment.env
-- 
cgit v1.2.3


From 8d3688ecfd4a0f1a8908a0cb471e7b7792d9b54b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 25 Mar 2022 13:47:56 +0100
Subject: git-hooks irc-announce: verbose == true, not false

---
 krebs/5pkgs/simple/git-hooks/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/krebs/5pkgs/simple/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix
index 13fe7aa67..3ec43739c 100644
--- a/krebs/5pkgs/simple/git-hooks/default.nix
+++ b/krebs/5pkgs/simple/git-hooks/default.nix
@@ -96,7 +96,7 @@ with stockholm.lib;
       #$host $GIT_SSH_REPO $ref $link
       add_message $(pink push) $link $(gray "($receive_mode)")
 
-      ${optionalString (verbose == false || typeOf verbose == "set") /* sh */ ''
+      ${optionalString (verbose == true || typeOf verbose == "set") /* sh */ ''
         ${optionalString (verbose.exclude or [] != []) /* sh */ ''
           case $ref in (${concatStringsSep "|" verbose.exclude})
             continue
-- 
cgit v1.2.3


From ae9c0b12710b5361d0d45510eb401eebfc1b3fb0 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 25 Mar 2022 14:29:50 +0100
Subject: iptables: fix range definition

---
 krebs/3modules/iptables.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/krebs/3modules/iptables.nix b/krebs/3modules/iptables.nix
index 3bab13b0e..7007090c0 100644
--- a/krebs/3modules/iptables.nix
+++ b/krebs/3modules/iptables.nix
@@ -125,8 +125,8 @@ let
         (interface: interfaceConfig: [
           (map (port: { predicate = "-i ${interface} -p tcp --dport ${toString port}"; target = "ACCEPT"; }) interfaceConfig.allowedTCPPorts)
           (map (port: { predicate = "-i ${interface} -p udp --dport ${toString port}"; target = "ACCEPT"; }) interfaceConfig.allowedUDPPorts)
-          (map (portRange: { predicate = "-i ${interface} -p tcp --dport ${toString port.from}:${toString port.to}"; target = "ACCEPT"; }) interfaceConfig.allowedTCPPortRanges)
-          (map (portRange: { predicate = "-i ${interface} -p udp --dport ${toString port.from}:${toString port.to}"; target = "ACCEPT"; }) interfaceConfig.allowedUDPPortRanges)
+          (map (portRange: { predicate = "-i ${interface} -p tcp --dport ${toString portRange.from}:${toString portRange.to}"; target = "ACCEPT"; }) interfaceConfig.allowedTCPPortRanges)
+          (map (portRange: { predicate = "-i ${interface} -p udp --dport ${toString portRange.from}:${toString portRange.to}"; target = "ACCEPT"; }) interfaceConfig.allowedUDPPortRanges)
         ])
         config.networking.firewall.interfaces
       );
-- 
cgit v1.2.3


From b9e0a7ec71e0318a992ff2b275a6aaee3cef63bd Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 28 Mar 2022 17:27:03 +0200
Subject: l fysiirc: strip newlines harder

---
 lass/2configs/fysiirc.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lass/2configs/fysiirc.nix b/lass/2configs/fysiirc.nix
index f3c1d5b7c..e12eda42e 100644
--- a/lass/2configs/fysiirc.nix
+++ b/lass/2configs/fysiirc.nix
@@ -54,14 +54,20 @@ in {
       name = "reaktor2-fysiweb-github";
     };
     script = ''. ${pkgs.writeDash "github-irc" ''
-      set -efu
+      set -xefu
       case "$Method $Request_URI" in
         "POST /")
-          payload=$(head -c "$req_content_length" \
-            | sed 's/+/ /g;s/%\(..\)/\\x\1/g;' \
-            | xargs -0 echo -e \
-          )
-          echo "$payload" | ${format-github-message}/bin/format-github-message
+          payload=$(head -c "$req_content_length")
+          echo "$payload" >&2
+          payload2=$payload
+          payload2=$(echo "$payload" | tr '\n' ' ' | tr -d '\r')
+          if [ "$payload" != "$payload2" ]; then
+            echo "payload has been mangled" >&2
+          else
+            echo "payload not mangled" >&2
+          fi
+          echo "$payload2" > /tmp/last_fysi_payload
+          echo "$payload2" | ${format-github-message}/bin/format-github-message
           printf 'HTTP/1.1 200 OK\r\n'
           printf 'Connection: close\r\n'
           printf '\r\n'
-- 
cgit v1.2.3


From 4ebbfbebf46dc5cd84ed5c51162c08fd2ecf0542 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 4 Apr 2022 18:19:51 +0200
Subject: l: add themes.nix

---
 lass/2configs/baseX.nix  |  1 +
 lass/2configs/themes.nix | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 lass/2configs/themes.nix

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 249410371..cbe592d52 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -13,6 +13,7 @@ in {
     ./pipewire.nix
     ./tmux.nix
     ./xmonad.nix
+    ./themes.nix
     {
       krebs.per-user.lass.packages = [
         pkgs.sshuttle
diff --git a/lass/2configs/themes.nix b/lass/2configs/themes.nix
new file mode 100644
index 000000000..dd98b2ef2
--- /dev/null
+++ b/lass/2configs/themes.nix
@@ -0,0 +1,46 @@
+{ config, lib, pkgs, ... }: let
+
+    switch-theme = pkgs.writers.writeDashBin "switch-theme" ''
+      if test -e "/etc/themes/$1"; then
+        ${pkgs.rsync}/bin/rsync --chown=lass:users -a --delete "/etc/themes/$1/" /var/theme/config/
+        echo "$1" > /var/theme/current_theme
+        chown lass:users /var/theme/current_theme
+        ${pkgs.procps}/bin/pkill -HUP xsettingsd
+
+      else
+        echo "theme $1 not found"
+      fi
+    '';
+
+in {
+  systemd.services.xsettingsd = {
+    wantedBy = [ "multi-user.target" ];
+    environment.DISPLAY = ":0";
+    serviceConfig = {
+      ExecStart = "${pkgs.xsettingsd}/bin/xsettingsd -c /var/theme/config/xsettings.conf";
+      User = "lass";
+    };
+  };
+  systemd.tmpfiles.rules = [
+    "d /var/theme/ 755 lass users"
+  ];
+  environment.systemPackages = [
+    switch-theme
+  ];
+  environment.etc = {
+    "themes/light/xsettings.conf".text = ''
+      Net/ThemeName "Adwaita" 
+    '';
+    "themes/dark/xsettings.conf".text = ''
+      Net/ThemeName "Adwaita-dark" 
+    '';
+  };
+  system.activationScripts.theme.text = ''
+    if test -e /var/theme/current_theme; then
+      ${switch-theme}/bin/switch-theme "$(cat /var/theme/current_theme)" ||
+      ${switch-theme}/bin/switch-theme dark
+    else
+      ${switch-theme}/bin/switch-theme dark
+    fi
+  '';
+}
-- 
cgit v1.2.3


From b3833baee96d7bce2c54295110b40c646468a1ff Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 4 Apr 2022 18:20:15 +0200
Subject: l: configure alacritty

---
 lass/2configs/alacritty.nix | 99 +++++++++++++++++++++++++++++++++++++++++++++
 lass/2configs/baseX.nix     |  1 +
 2 files changed, 100 insertions(+)
 create mode 100644 lass/2configs/alacritty.nix

diff --git a/lass/2configs/alacritty.nix b/lass/2configs/alacritty.nix
new file mode 100644
index 000000000..a57dc7c25
--- /dev/null
+++ b/lass/2configs/alacritty.nix
@@ -0,0 +1,99 @@
+{ config, lib, pkgs, ... }: let
+
+  alacritty-cfg = extrVals: builtins.toJSON ({
+    font = {
+      normal = {
+        family = "Inconsolata";
+        style = "Regular";
+      };
+      bold = {
+        family = "Inconsolata";
+        style = "Bold";
+      };
+      italic = {
+        family = "Inconsolata";
+        style = "Italic";
+      };
+      bold_italic = {
+        family = "Inconsolata";
+        style = "Bold Italic";
+      };
+      size = 8;
+    };
+    live_config_reload = true;
+    window.dimensions = {
+      columns = 80;
+      lines = 20;
+    };
+    # window.opacity = 0;
+    hints.enabled = [
+      {
+        regex = ''(mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)[^\u0000-\u001F\u007F-\u009F<>"\s{-}\^⟨⟩`]+'';
+        command = "/run/current-system/sw/bin/xdg-open";
+        post_processing = true;
+        mouse.enabled = true;
+        binding = {
+          key = "U";
+          mods = "Alt";
+        };
+      }
+    ];
+  } // extrVals);
+
+  alacritty = pkgs.symlinkJoin {
+    name = "alacritty";
+    paths = [
+      (pkgs.writeDashBin "alacritty" ''
+        ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yaml "$@"
+      '')
+      pkgs.alacritty
+    ];
+  };
+
+in {
+  environment.etc = {
+    "themes/light/alacritty.yaml".text = alacritty-cfg {
+      colors = {
+        # Default colors
+        primary = {
+          # hard contrast: background = '#f9f5d7'
+          # background = "#fbf1c7";
+          background = "#f9f5d7";
+          # soft contrast: background = '#f2e5bc'
+          foreground = "#3c3836";
+        };
+
+        # Normal colors
+        normal = {
+          black = "#fbf1c7";
+          red =     "#cc241d";
+          green =   "#98971a";
+          yellow =  "#d79921";
+          blue =    "#458588";
+          magenta = "#b16286";
+          cyan =    "#689d6a";
+          white =   "#7c6f64";
+        };
+
+        # Bright colors
+        bright = {
+          black =   "#928374";
+          red =     "#9d0006";
+          green =   "#79740e";
+          yellow =  "#b57614";
+          blue =    "#076678";
+          magenta = "#8f3f71";
+          cyan =    "#427b58";
+          white =   "#3c3836";
+        };
+      };
+    };
+    "themes/dark/alacritty.yaml".text = alacritty-cfg {
+      colors.primary = {
+        background = "#000000";
+        foreground = "#ffffff";
+      };
+    };
+  };
+  environment.systemPackages = [ alacritty ];
+}
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index cbe592d52..22a3037d7 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -4,6 +4,7 @@ let
   user = config.krebs.build.user;
 in {
   imports = [
+    ./alacritty.nix
     ./mpv.nix
     ./power-action.nix
     ./copyq.nix
-- 
cgit v1.2.3


From 1407ad3502a7dd46d6e432b7ccc013bc80341bb1 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Apr 2022 22:16:29 +0200
Subject: pager: init at 1.0.0

---
 krebs/5pkgs/haskell/pager.nix | 23 +++++++++++++++++++++++
 krebs/5pkgs/simple/pager.nix  | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 krebs/5pkgs/haskell/pager.nix
 create mode 100644 krebs/5pkgs/simple/pager.nix

diff --git a/krebs/5pkgs/haskell/pager.nix b/krebs/5pkgs/haskell/pager.nix
new file mode 100644
index 000000000..3c9f80466
--- /dev/null
+++ b/krebs/5pkgs/haskell/pager.nix
@@ -0,0 +1,23 @@
+{ mkDerivation, base, blessings, bytestring, containers
+, data-default, hack, lib, optparse-applicative, probability
+, scanner, speculate, split, terminal-size, text, unix, X11
+, fetchgit
+}:
+mkDerivation {
+  pname = "pager";
+  version = "1.0.0";
+  src = fetchgit {
+    url = "https://cgit.krebsco.de/pager";
+    sha256 = "1kqd27faxinkwpxancyk0xl6n7ljlc8iqhnnq85l76bk4qi9b45i";
+    rev = "f4cdf79bd4a75e9eafe68b9a908f4cc68682b7ef";
+    fetchSubmodules = true;
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    base blessings bytestring containers data-default hack
+    optparse-applicative probability scanner speculate split
+    terminal-size text unix X11
+  ];
+  license = lib.licenses.mit;
+}
diff --git a/krebs/5pkgs/simple/pager.nix b/krebs/5pkgs/simple/pager.nix
new file mode 100644
index 000000000..f156f7414
--- /dev/null
+++ b/krebs/5pkgs/simple/pager.nix
@@ -0,0 +1,34 @@
+{ pkgs }:
+
+pkgs.writeDashBin "pager" ''
+  # usage: pager {view,shift,shiftview}
+  #
+  # Environment variables
+  #
+  #   PAGER_NAME (default: Pager)
+  #     The environment variables specifies the application name under which
+  #     resources are to be obtained.  PAGER_NAME should not contain “.” or “*”
+  #     characters.
+  #
+  set -efu
+
+  pidfile=$XDG_RUNTIME_DIR/pager.lock
+  name=''${PAGER_NAME-Pager}
+
+  if test -e "$pidfile" &&
+     ${pkgs.procps}/bin/pgrep --pidfile="$pidfile" >/dev/null
+  then
+    ${pkgs.procps}/bin/pkill --pidfile="$pidfile"
+    ${pkgs.coreutils}/bin/rm "$pidfile"
+    exit
+  fi
+
+  echo $$ > "$pidfile"
+
+  exec ${pkgs.xterm}/bin/xterm \
+      -name "$name" \
+      -ti vt340 \
+      -xrm 'Pager*geometry: 32x10' \
+      -xrm 'Pager*internalBorder: 2' \
+      -e ${pkgs.haskellPackages.pager}/bin/pager "$@"
+''
-- 
cgit v1.2.3


From 941476b492f54890a161d7564736b05f083001ed Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Apr 2022 23:06:12 +0200
Subject: pager: add default fg and bg colors

---
 krebs/5pkgs/simple/pager.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/krebs/5pkgs/simple/pager.nix b/krebs/5pkgs/simple/pager.nix
index f156f7414..ed740490d 100644
--- a/krebs/5pkgs/simple/pager.nix
+++ b/krebs/5pkgs/simple/pager.nix
@@ -30,5 +30,7 @@ pkgs.writeDashBin "pager" ''
       -ti vt340 \
       -xrm 'Pager*geometry: 32x10' \
       -xrm 'Pager*internalBorder: 2' \
+      -xrm 'Pager*background: #050505' \
+      -xrm 'Pager*foreground: #d0d7d0' \
       -e ${pkgs.haskellPackages.pager}/bin/pager "$@"
 ''
-- 
cgit v1.2.3


From cb582632bad5ed93c4da46cfac97b8543c261687 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 6 Apr 2022 13:50:12 +0200
Subject: nixpkgs: 31aa631 -> ccb90fb

---
 krebs/nixpkgs.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 62391dbf0..8350103ca 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "31aa631dbc496500efd2507baaed39626f6650f2",
-  "date": "2022-03-21T15:39:15-07:00",
-  "path": "/nix/store/zdzdalfl2ksb5vlrj1jcqkf6jgvrfhwf-nixpkgs",
-  "sha256": "08qaraj9j7m2g1ldhpkg8ksylk7s00mr7khkzif0m8jshkq8j92b",
+  "rev": "ccb90fb9e11459aeaf83cc28d5f8910816d90dd0",
+  "date": "2022-04-04T17:03:39-07:00",
+  "path": "/nix/store/vxni0wi5qvk6nj2kzrzar5i5yn5hcnhx-nixpkgs",
+  "sha256": "1jlyhw5nf7pcxg22k1bwkv13vm02p86d7jf6znihl3hczz1yfgi0",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-- 
cgit v1.2.3


From bac7b70f86dc8077e677cc2e72e33e97c07ee9c0 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 6 Apr 2022 13:51:33 +0200
Subject: nixpkgs-unstable: 9bc841f -> bc4b9ee

---
 krebs/nixpkgs-unstable.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json
index b8d5c6d01..780b88e23 100644
--- a/krebs/nixpkgs-unstable.json
+++ b/krebs/nixpkgs-unstable.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "9bc841fec1c0e8b9772afa29f934d2c7ce57da8e",
-  "date": "2022-03-20T19:18:44+01:00",
-  "path": "/nix/store/zqxcjhw0x555zaxn55qnaszkabk1r4vi-nixpkgs",
-  "sha256": "0hh1gpw3lcacz3qba7pcc7j1vc09gawa4lzff3mkgsrmp732hg5f",
+  "rev": "bc4b9eef3ce3d5a90d8693e8367c9cbfc9fc1e13",
+  "date": "2022-04-03T20:54:34+02:00",
+  "path": "/nix/store/gq3yksl89prg9zb8zcxlzbyq0zac1mh7-nixpkgs",
+  "sha256": "0mrpsl0554fzk04asz0nmyxf6ny1syd9qzrh37vz85bpq8wi21dx",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-- 
cgit v1.2.3


From 379f216fc701a6fde36f716e1708e9b8b0aaa8ba Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 6 Apr 2022 14:48:13 +0200
Subject: hack: 1.0.0 -> 1.0.1

---
 krebs/5pkgs/haskell/hack.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/krebs/5pkgs/haskell/hack.nix b/krebs/5pkgs/haskell/hack.nix
index 37ef94e46..df3343818 100644
--- a/krebs/5pkgs/haskell/hack.nix
+++ b/krebs/5pkgs/haskell/hack.nix
@@ -3,11 +3,11 @@
 }:
 mkDerivation {
   pname = "hack";
-  version = "1.0.0";
+  version = "1.0.1";
   src = fetchgit {
     url = "https://cgit.krebsco.de/hack";
-    sha256 = "0hi6frpnxbg3h6s7gd48ri57jc226qycy4rnhmpzpq195xf8y3pf";
-    rev = "cb004b2e5f0fce6cea8d54e60558a1c1904dbe39";
+    sha256 = "0ry5ikn89ij512qvk1xhdhfz4s8a6b9yawgx6lxgnw5jkiyjd7ka";
+    rev = "f3ea150aca5cc86878fa10bc5b1f0918fc154e2a";
     fetchSubmodules = true;
   };
   isLibrary = true;
-- 
cgit v1.2.3


From 0e9cc04c196445c4e07ee4e1f331a3984a0066dd Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 6 Apr 2022 15:32:06 +0200
Subject: xmonad-stockholm: 1.3.0 -> 1.3.1

---
 krebs/5pkgs/haskell/xmonad-stockholm.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/krebs/5pkgs/haskell/xmonad-stockholm.nix b/krebs/5pkgs/haskell/xmonad-stockholm.nix
index 751f26749..5fe348799 100644
--- a/krebs/5pkgs/haskell/xmonad-stockholm.nix
+++ b/krebs/5pkgs/haskell/xmonad-stockholm.nix
@@ -1,15 +1,18 @@
-{ mkDerivation, base, containers, fetchgit, filepath, lib, unix, X11, X11-xft , X11-xshape, xmonad, xmonad-contrib
+{ mkDerivation, base, containers, directory, fetchgit, filepath
+, lib, unix, X11, X11-xft, X11-xshape, xmonad, xmonad-contrib
 }:
-mkDerivation rec {
+mkDerivation {
   pname = "xmonad-stockholm";
-  version = "1.3.0";
+  version = "1.3.1";
   src = fetchgit {
-    url = http://cgit.ni.krebsco.de/xmonad-stockholm;
-    rev = "refs/tags/v1.3.0";
-    sha256 = "1np5126wn67y0a1r60rnkq828s0w9zjnvai4b8zy3yc02xlkrjm9";
+    url = "https://cgit.krebsco.de/xmonad-stockholm";
+    sha256 = "1x5fjjrdgswv7fjnnmwvv2zicdszmkrsh564m7za4y54zg57wsx2";
+    rev = "3cd58b7d415d320e67516be952be8d30c020bd81";
+    fetchSubmodules = true;
   };
   libraryHaskellDepends = [
-    base containers filepath unix X11 X11-xft X11-xshape xmonad xmonad-contrib
+    base containers directory filepath unix X11 X11-xft X11-xshape
+    xmonad xmonad-contrib
   ];
   license = lib.licenses.mit;
 }
-- 
cgit v1.2.3


From 59056a2e404544b418bf7be0cfb087ac292761fc Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 6 Apr 2022 15:32:06 +0200
Subject: xmonad-stockholm: 1.3.0 -> 1.3.1

---
 krebs/5pkgs/haskell/xmonad-stockholm.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/krebs/5pkgs/haskell/xmonad-stockholm.nix b/krebs/5pkgs/haskell/xmonad-stockholm.nix
index 751f26749..c43dbe271 100644
--- a/krebs/5pkgs/haskell/xmonad-stockholm.nix
+++ b/krebs/5pkgs/haskell/xmonad-stockholm.nix
@@ -1,15 +1,18 @@
-{ mkDerivation, base, containers, fetchgit, filepath, lib, unix, X11, X11-xft , X11-xshape, xmonad, xmonad-contrib
+{ mkDerivation, base, containers, directory, fetchgit, filepath
+, lib, unix, X11, X11-xft, X11-xshape, xmonad, xmonad-contrib
 }:
-mkDerivation rec {
+mkDerivation {
   pname = "xmonad-stockholm";
-  version = "1.3.0";
+  version = "1.3.1";
   src = fetchgit {
-    url = http://cgit.ni.krebsco.de/xmonad-stockholm;
-    rev = "refs/tags/v1.3.0";
-    sha256 = "1np5126wn67y0a1r60rnkq828s0w9zjnvai4b8zy3yc02xlkrjm9";
+    url = "https://cgit.krebsco.de/xmonad-stockholm";
+    sha256 = "1m4kkppy143jvjzhy5aawh8q6sglpnqhiajxbdcr42j02ibf3vvq";
+    rev = "89bae8aad73db8fe9e11da7d515f0b236e7fea51";
+    fetchSubmodules = true;
   };
   libraryHaskellDepends = [
-    base containers filepath unix X11 X11-xft X11-xshape xmonad xmonad-contrib
+    base containers directory filepath unix X11 X11-xft X11-xshape
+    xmonad xmonad-contrib
   ];
   license = lib.licenses.mit;
 }
-- 
cgit v1.2.3


From 2dc7d98430bd9fa0c95c54083e8ff72755d363b4 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 15 Apr 2022 11:08:02 +0200
Subject: nixpkgs: ccb90fb -> 2f06b87

---
 krebs/nixpkgs.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 8350103ca..5daeb5f44 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "ccb90fb9e11459aeaf83cc28d5f8910816d90dd0",
-  "date": "2022-04-04T17:03:39-07:00",
-  "path": "/nix/store/vxni0wi5qvk6nj2kzrzar5i5yn5hcnhx-nixpkgs",
-  "sha256": "1jlyhw5nf7pcxg22k1bwkv13vm02p86d7jf6znihl3hczz1yfgi0",
+  "rev": "2f06b87f64bc06229e05045853e0876666e1b023",
+  "date": "2022-04-14T11:00:29-03:00",
+  "path": "/nix/store/bxspkr9qcbkzgrx16axi2qqbny9hcbvz-nixpkgs",
+  "sha256": "1d7zg96xw4qsqh7c89pgha9wkq3rbi9as3k3d88jlxy2z0ns0cy2",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-- 
cgit v1.2.3


From c32797f7a18dc657f5d6ff08af38891904416154 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 15 Apr 2022 11:16:19 +0200
Subject: nixpkgs-unstable: bc4b9ee -> ff9efb0

---
 krebs/nixpkgs-unstable.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json
index 780b88e23..0ab773cb1 100644
--- a/krebs/nixpkgs-unstable.json
+++ b/krebs/nixpkgs-unstable.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "bc4b9eef3ce3d5a90d8693e8367c9cbfc9fc1e13",
-  "date": "2022-04-03T20:54:34+02:00",
-  "path": "/nix/store/gq3yksl89prg9zb8zcxlzbyq0zac1mh7-nixpkgs",
-  "sha256": "0mrpsl0554fzk04asz0nmyxf6ny1syd9qzrh37vz85bpq8wi21dx",
+  "rev": "ff9efb0724de5ae0f9db9df2debefced7eb1571d",
+  "date": "2022-04-12T21:26:28-03:00",
+  "path": "/nix/store/85qw9pp6zxy2dcgshm2xkhhhccrnp8hy-nixpkgs",
+  "sha256": "188h461pilsiym2dqzl17vx1g9pb816cwdi0az9mbw207w721avz",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-- 
cgit v1.2.3


From 83ad464d68217a337c9feb83ce72cf5fe7018f61 Mon Sep 17 00:00:00 2001