From 0a09093b4185d8fa222b0d2e37bda279aa69d2a7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 18 Jan 2021 23:13:21 +0100
Subject: repo-sync: use cfg.privateKeyFile.path

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

diff --git a/krebs/3modules/repo-sync.nix b/krebs/3modules/repo-sync.nix
index 91111f3eb..f9877c0f8 100644
--- a/krebs/3modules/repo-sync.nix
+++ b/krebs/3modules/repo-sync.nix
@@ -176,7 +176,7 @@ let
         ];
 
         environment = {
-          GIT_SSH_COMMAND = "${pkgs.openssh}/bin/ssh -i ${cfg.stateDir}/ssh.priv";
+          GIT_SSH_COMMAND = "${pkgs.openssh}/bin/ssh -i ${cfg.privateKeyFile.path}";
           REPONAME = "${name}.git";
         };
 
-- 
cgit v1.2.3


From e2ed72a7802b0620bb1388a901b34e5a5fdc8a26 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 19 Jan 2021 01:19:51 +0100
Subject: tv repo-sync wiki: init

---
 tv/2configs/repo-sync/wiki.nix | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 tv/2configs/repo-sync/wiki.nix

diff --git a/tv/2configs/repo-sync/wiki.nix b/tv/2configs/repo-sync/wiki.nix
new file mode 100644
index 000000000..913439906
--- /dev/null
+++ b/tv/2configs/repo-sync/wiki.nix
@@ -0,0 +1,41 @@
+{ config, pkgs, ... }: let
+  lib = import <stockholm/lib>;
+in {
+  krebs.repo-sync.enable = true;
+  krebs.repo-sync.repos.wiki.branches.hotdog = {
+    origin.url = "http://cgit.hotdog.r/wiki";
+    mirror.url = "git@${config.krebs.build.host.name}.r:wiki";
+  };
+  krebs.git.repos.wiki = {
+    public = true;
+    name = "wiki";
+    cgit.desc = toString [
+      "mirror of"
+      config.krebs.repo-sync.repos.wiki.branches.hotdog.origin.url
+    ];
+    cgit.section = "7. mirrors";
+    hooks.post-receive = /* sh */ ''
+      ${pkgs.git-hooks.irc-announce {
+        channel = "#xxx";
+        nick = config.krebs.build.host.name;
+        server = "irc.r";
+      }}
+      ${pkgs.cgit-clear-cache.override {
+        inherit (config.krebs.git.cgit.settings) cache-root;
+      }}/bin/cgit-clear-cache
+    '';
+  };
+  krebs.git.rules = lib.singleton {
+    user = lib.singleton config.krebs.users.repo-sync;
+    repo = lib.singleton config.krebs.git.repos.wiki;
+    perm = lib.git.push "refs/*" [
+      lib.git.create
+      lib.git.delete
+      lib.git.merge
+      lib.git.non-fast-forward
+    ];
+  };
+  krebs.users.${config.krebs.repo-sync.user.name}.pubkey = {
+    ni = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINK9U0Ob9/O0kxg3trhZY/vDnbqfN+R5cASGiClRr4IM";
+  }.${config.krebs.build.host.name};
+}
-- 
cgit v1.2.3


From 1cd73df0c8694f491d40f93a796ea58f150e88dc Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 21 Jan 2021 17:29:01 +0100
Subject: krebs.backup fping: select fastest by elapsed time

---
 krebs/3modules/backup.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/krebs/3modules/backup.nix b/krebs/3modules/backup.nix
index c0b218c15..910324f3c 100644
--- a/krebs/3modules/backup.nix
+++ b/krebs/3modules/backup.nix
@@ -226,10 +226,14 @@ let
 
   # XXX Is one ping enough to determine fastest address?
   fastest-address = host: ''
-    { ${pkgs.fping}/bin/fping </dev/null -a \
+    { ${pkgs.fping}/bin/fping </dev/null -a -e \
         ${concatMapStringsSep " " shell.escape
           (mapAttrsToList (_: net: head net.aliases) host.nets)} \
-      | ${pkgs.coreutils}/bin/head -1; }
+      | ${pkgs.gnused}/bin/sed -r 's/^(\S+) \(([0-9.]+) ms\)$/\2\t\1/' \
+      | ${pkgs.coreutils}/bin/sort -n \
+      | ${pkgs.coreutils}/bin/cut -f2 \
+      | ${pkgs.coreutils}/bin/head -n 1
+    }
   '';
 
 in out
-- 
cgit v1.2.3


From 88c6558935373fa7caf8730497d63894daef436d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 22 Jan 2021 01:02:45 +0100
Subject: tv ppp: allow networkd

---
 tv/2configs/ppp.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tv/2configs/ppp.nix b/tv/2configs/ppp.nix
index ff61f943f..c801401b2 100644
--- a/tv/2configs/ppp.nix
+++ b/tv/2configs/ppp.nix
@@ -8,8 +8,10 @@
 in {
   assertions = [
     {
-      assertion = config.networking.resolvconf.enable;
-      message = "ppp configuration needs resolvconf";
+      assertion =
+        config.networking.resolvconf.enable ||
+        config.networking.useNetworkd;
+      message = "ppp configuration needs resolvconf or networkd";
     }
   ];
   environment.etc."ppp/ip-up".source = pkgs.writeDash "ppp.ip-up" ''
-- 
cgit v1.2.3


From 429f25630b7bffe6ff0dca87f12ec783a135517a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 22 Jan 2021 20:39:25 +0100
Subject: tv vim: remap fzf keys

---
 tv/2configs/vim.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index f8d599f7e..4f961cd46 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -133,7 +133,8 @@ let {
     vnoremap u <nop>
 
     " fzf
-    nnoremap <esc>q :Files<cr>
+    nnoremap <esc>q :Buffers<cr>
+    nnoremap <esc>f :Files<cr>
     nnoremap <esc>w :Rg<cr>
 
     " edit alternate buffer
-- 
cgit v1.2.3


From dc87cea9e58fa6b7bdcf578b4d783c2faccc6d9a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 23 Jan 2021 14:42:26 +0100
Subject: tv hu: init

---
 krebs/3modules/tv/default.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 6a09cc834..92f1a5bcd 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -82,6 +82,31 @@ in {
       ssh.privkey.path = config.krebs.secret.file "ssh.id_ed25519";
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBsqDuhGJpjpqNv4QmjoOhcODObrPyY3GHLvtVkgXV0g root@au";
     };
+    hu = {
+      nets = {
+        retiolum = {
+          ip4.addr = "10.243.13.41";
+          aliases = [
+            "hu.r"
+          ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----
+            MIIBCgKCAQEAwj5T9Rejp8zGVrHjqA+OeMvcVpax4VazssnRPSUznUEOdVEeSJL5
+            8gDBJPtIfxF8iunXr5K7CW036tKvYaGMDwYMOPJZXhFCmU2yUF2g4BcqEhuDdIfO
+            +D2Pfr4lc9xO90SKOgwJ53qhf5yqeU/WQ3dpCF/n8k4SUmdafTsvh00UrxYpHuTU
+            C22BRXIKR4r/sCJUitWQSWNdSQUxh3lu7sUPr+6sZyJov+eu8oBVlPgYOv6u9nZe
+            YhrbCPDKMGPfnQTAtWfHIxNt70Ec5AG6ddQzLeVcM2gP5qi957Fert+C2RNtbz5s
+            Brbw1bqZ3P+CGzvxVJZtirvR2f3HkidGPQIDAQAB
+            -----END RSA PUBLIC KEY-----
+          '';
+          tinc.pubkey_ed25519 =
+            "Ed25519PublicKey = PV8Dz9ni2cPXyJGiG5oU0XWdJkUPgrMzDuzHj7kpMzO";
+        };
+      };
+      secure = true;
+      ssh.privkey.path = config.krebs.secret.file "ssh.id_ed25519";
+      ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO+Rrf9tvuusYlnSZwUiHS4O+AhrpVZ/6n7peSRKojTc root@hu";
+    };
     mu = {
       ci = true;
       cores = 2;
-- 
cgit v1.2.3


From 6b68a4f5d8b61e91585b422a7b42f98ac6ec007f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 24 Jan 2021 01:24:19 +0100
Subject: tv cr: use XDG_RUNTIME_DIR

---
 tv/5pkgs/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index fd3d2f32a..cae5da112 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -13,13 +13,17 @@ foldl' mergeAttrs {}
 //
 
 {
-  # TODO use XDG_RUNTIME_DIR?
   cr = self.writeDashBin "cr" ''
     set -efu
+    if test -n "''${XDG_RUNTIME_DIR-}"; then
+      cache_dir=$XDG_RUNTIME_DIR/chromium-disk-cache
+    else
+      cache_dir=/tmp/chromium-disk-cache_$LOGNAME
+    fi
     export LC_TIME=de_DE.utf8
     exec ${self.chromium}/bin/chromium \
         --ssl-version-min=tls1 \
-        --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
+        --disk-cache-dir="$cache_dir" \
         --disk-cache-size=50000000 \
         "$@"
   '';
-- 
cgit v1.2.3


From 549f3fd553155412f04870a31849b29776a63d59 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 26 Jan 2021 17:48:55 +0100
Subject: news: rename brockman-helper to candyman, fix reddit link

---
 krebs/2configs/news.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix
index 3bf991433..7f4020ca2 100644
--- a/krebs/2configs/news.nix
+++ b/krebs/2configs/news.nix
@@ -42,7 +42,7 @@
   krebs.reaktor2.news = {
     hostname = "localhost";
     port = "6667";
-    nick = "brockman-helper";
+    nick = "candyman";
     plugins = [
       {
         plugin = "register";
@@ -71,7 +71,7 @@
                     exit 1
                   fi
                   reddit_channel=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
-                  echo "brockman: add r_$reddit_channel http://rss.r/?action=display&bridge=Telegram&username=$reddit_channel&format=Mrss"
+                  echo "brockman: add r_$reddit_channel http://rss.r/?action=display&bridge=Reddit&context=single&r=$reddit_channel&format=Atom"
                 '';
                 add-telegram.filename = pkgs.writeDash "add-telegram" ''
                   set -euf
-- 
cgit v1.2.3


From 6a29e8bfcc34b7d59957793496789909fa9e994a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 26 Jan 2021 20:20:05 +0100
Subject: upstream modules: init

---
 krebs/3modules/default.nix          |  1 +
 krebs/3modules/upstream/default.nix | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 krebs/3modules/upstream/default.nix

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index e7d04ead8..85d27459b 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -55,6 +55,7 @@ let
       ./sync-containers.nix
       ./tinc.nix
       ./tinc_graphs.nix
+      ./upstream
       ./urlwatch.nix
       ./repo-sync.nix
       ./xresources.nix
diff --git a/krebs/3modules/upstream/default.nix b/krebs/3modules/upstream/default.nix
new file mode 100644
index 000000000..ce7bd1644
--- /dev/null
+++ b/krebs/3modules/upstream/default.nix
@@ -0,0 +1,10 @@
+with import <stockholm/lib>;
+
+{
+  imports =
+    map
+      (name: ./. + "/${name}")
+      (filter
+        (name: name != "default.nix" && !hasPrefix "." name)
+        (attrNames (readDir ./.)));
+}
-- 
cgit v1.2.3


From 46f57b43888027bd245d14087fc096329729cb03 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 25 Jan 2021 01:42:51 +0100
Subject: nixos/none: don't pull in feh unconditionally

---
 krebs/3modules/upstream/desktop-managers/default.nix |  5 +++++
 krebs/3modules/upstream/desktop-managers/none.nix    | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 krebs/3modules/upstream/desktop-managers/default.nix
 create mode 100644 krebs/3modules/upstream/desktop-managers/none.nix

diff --git a/krebs/3modules/upstream/desktop-managers/default.nix b/krebs/3modules/upstream/desktop-managers/default.nix
new file mode 100644
index 000000000..4f60ee27d
--- /dev/null
+++ b/krebs/3modules/upstream/desktop-managers/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./none.nix
+  ];
+}
diff --git a/krebs/3modules/upstream/desktop-managers/none.nix b/krebs/3modules/upstream/desktop-managers/none.nix
new file mode 100644
index 000000000..892def985
--- /dev/null
+++ b/krebs/3modules/upstream/desktop-managers/none.nix
@@ -0,0 +1,11 @@
+# Replace upstream none desktop-manager by a real none, that doesn't pull in
+# any dependencies.
+with import <stockholm/lib>;
+{
+  disabledModules = singleton "services/x11/desktop-managers/none.nix";
+  config.services.xserver.desktopManager.session = singleton {
+    name = "none";
+    bgSupport = true;
+    start = "";
+  };
+}
-- 
cgit v1.2.3


From 21303714afa87ca3081a9fbc4585d86badc131bb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 25 Jan 2021 01:46:22 +0100
Subject: nixos/coma: init sleep as desktop manager

---
 krebs/3modules/upstream/desktop-managers/coma.nix   | 21 +++++++++++++++++++++
 .../3modules/upstream/desktop-managers/default.nix  |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 krebs/3modules/upstream/desktop-managers/coma.nix

diff --git a/krebs/3modules/upstream/desktop-managers/coma.nix b/krebs/3modules/upstream/desktop-managers/coma.nix
new file mode 100644
index 000000000..95db7fb5c
--- /dev/null
+++ b/krebs/3modules/upstream/desktop-managers/coma.nix
@@ -0,0 +1,21 @@
+with import <stockholm/lib>;
+{ config, pkgs, ... }: {
+  options = {
+    services.xserver.desktopManager.coma = {
+      enable = mkEnableOption "sleep as a desktop manager";
+    };
+  };
+  config = mkIf config.services.xserver.desktopManager.coma.enable {
+    services.xserver.desktopManager.session = singleton {
+      name = "coma";
+      bgSupport = true;
+      start = /* sh */ ''
+        if test -n "$waitPID"; then
+          ${pkgs.uutils-coreutils}/bin/uutils-sleep 1s && kill $waitPID &
+          wait $waitPID
+        fi
+        exec -a sleep ${pkgs.uutils-coreutils}/bin/uutils-sleep infinity
+      '';
+    };
+  };
+}
diff --git a/krebs/3modules/upstream/desktop-managers/default.nix b/krebs/3modules/upstream/desktop-managers/default.nix
index 4f60ee27d..22e75439d 100644
--- a/krebs/3modules/upstream/desktop-managers/default.nix
+++ b/krebs/3modules/upstream/desktop-managers/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./coma.nix
     ./none.nix
   ];
 }
-- 
cgit v1.2.3


From 6e9f5602a92933dafc1f6c0420aa4329cdd9a17d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 25 Jan 2021 01:54:28 +0100
Subject: nixos/xmonad: import and make reloadable

Import nixos/modules/services/x11/window-managers/xmonad.nix from
nixpkgs de121de16ef947bc8e8bfdaa37b5c6cc506050c6 and turn it into
a user service that reloads xmonad whenever its configuration changes.
---
 .../3modules/upstream/window-managers/default.nix  |  22 +++
 krebs/3modules/upstream/window-managers/xmonad.nix | 189 +++++++++++++++++++++
 2 files changed, 211 insertions(+)
 create mode 100644 krebs/3modules/upstream/window-managers/default.nix
 create mode 100644 krebs/3modules/upstream/window-managers/xmonad.nix

diff --git a/krebs/3modules/upstream/window-managers/default.nix b/krebs/3modules/upstream/window-managers/default.nix
new file mode 100644
index 000000000..eecadca7e
--- /dev/null
+++ b/krebs/3modules/upstream/window-managers/default.nix
@@ -0,0 +1,22 @@
+{
+  imports = [
+    # Replace upstream xmonad module with one that will be reloaded if changed.
+    #
+    # This module is intended to be upstreamed once fully tested.
+    # The patch to be committed can be obtained using:
+    #
+    # diff -u <nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix> \
+    #         <stockholm/tv/3modules/window-managers/xmonad.nix>
+    #
+    {
+      disabledModules = [ "services/x11/window-managers/xmonad.nix" ];
+      imports = [ ./xmonad.nix ];
+      nixpkgs.overlays = [(self: super: {
+        writers = super.writers // {
+          writeHaskellBin = name: spec: with import <stockholm/lib>;
+            super.writers.writeHaskellBin name (removeAttrs spec ["ghcArgs"]);
+        };
+      })];
+    }
+  ];
+}
diff --git a/krebs/3modules/upstream/window-managers/xmonad.nix b/krebs/3modules/upstream/window-managers/xmonad.nix
new file mode 100644
index 000000000..356fa46bf
--- /dev/null
+++ b/krebs/3modules/upstream/window-managers/xmonad.nix
@@ -0,0 +1,189 @@
+{pkgs, lib, config, ...}:
+
+with lib;
+let
+  inherit (lib) mkOption mkIf optionals literalExample;
+  cfg = config.services.xserver.windowManager.xmonad;
+
+  ghcWithPackages = cfg.haskellPackages.ghcWithPackages;
+  packages = self: cfg.extraPackages self ++
+                   optionals cfg.enableContribAndExtras
+                   [ self.xmonad-contrib self.xmonad-extras ];
+
+  xmonad-vanilla = pkgs.xmonad-with-packages.override {
+    inherit ghcWithPackages packages;
+  };
+
+  xmonad-config =
+    let
+      xmonadAndPackages = self: [ self.xmonad ] ++ packages self;
+      xmonadEnv = ghcWithPackages xmonadAndPackages;
+      configured = pkgs.writers.writeHaskellBin "xmonad" {
+        ghc = cfg.haskellPackages.ghc;
+        libraries = xmonadAndPackages cfg.haskellPackages;
+        inherit (cfg) ghcArgs;
+      } cfg.config;
+    in
+      pkgs.runCommandLocal "xmonad" {
+        nativeBuildInputs = [ pkgs.makeWrapper ];
+      } ''
+        install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz
+        makeWrapper ${configured}/bin/xmonad $out/bin/xmonad \
+          --set NIX_GHC "${xmonadEnv}/bin/ghc" \
+          --set XMONAD_XMESSAGE "${pkgs.xorg.xmessage}/bin/xmessage"
+      '';
+
+  xmonad = if (cfg.config != null) then xmonad-config else xmonad-vanilla;
+in {
+  meta.maintainers = with maintainers; [ lassulus xaverdh ivanbrennan ];
+
+  options = {
+    services.xserver.windowManager.xmonad = {
+      enable = mkEnableOption "xmonad";
+      haskellPackages = mkOption {
+        default = pkgs.haskellPackages;
+        defaultText = "pkgs.haskellPackages";
+        example = literalExample "pkgs.haskell.packages.ghc784";
+        description = ''
+          haskellPackages used to build Xmonad and other packages.
+          This can be used to change the GHC version used to build
+          Xmonad and the packages listed in
+          <varname>extraPackages</varname>.
+        '';
+      };
+
+      extraPackages = mkOption {
+        default = self: [];
+        defaultText = "self: []";
+        example = literalExample ''
+          haskellPackages: [
+            haskellPackages.xmonad-contrib
+            haskellPackages.monad-logger
+          ]
+        '';
+        description = ''
+          Extra packages available to ghc when rebuilding Xmonad. The
+          value must be a function which receives the attrset defined
+          in <varname>haskellPackages</varname> as the sole argument.
+        '';
+      };
+
+      enableContribAndExtras = mkOption {
+        default = false;
+        type = lib.types.bool;
+        description = "Enable xmonad-{contrib,extras} in Xmonad.";
+      };
+
+      config = mkOption {
+        default = null;
+        type = with lib.types; nullOr (either path str);
+        description = ''
+          Configuration from which XMonad gets compiled. If no value is
+          specified, a vanilla xmonad binary is put in PATH, which will
+          attempt to recompile and exec your xmonad config from $HOME/.xmonad.
+          This setup is then analogous to other (non-NixOS) linux distributions.
+
+          If you do set this option, you likely want to use "launch" as your
+          entry point for xmonad (as in the example), to avoid xmonad's
+          recompilation logic on startup. Doing so will render the default
+          "mod+q" restart key binding dysfunctional though, because that attempts
+          to call your binary with the "--restart" command line option, unless
+          you implement that yourself. You way mant to bind "mod+q" to
+          <literal>(restart "xmonad" True)</literal> instead, which will just restart
+          xmonad from PATH. This allows e.g. switching to the new xmonad binary
+          after rebuilding your system with nixos-rebuild.
+
+          If you actually want to run xmonad with a config specified here, but
+          also be able to recompile and restart it from a copy of that source in
+          $HOME/.xmonad on the fly, you will have to implement that yourself
+          using something like "compileRestart" from the example.
+          This should allow you to switch at will between the local xmonad and
+          the one NixOS puts in your PATH.
+        '';
+        example = ''
+          import XMonad
+          import XMonad.Util.EZConfig (additionalKeys)
+          import Control.Monad (when)
+          import Text.Printf (printf)
+          import System.Posix.Process (executeFile)
+          import System.Info (arch,os)
+          import System.Environment (getArgs)
+          import System.FilePath ((</>))
+
+          compiledConfig = printf "xmonad-%s-%s" arch os
+
+          compileRestart resume =
+            whenX (recompile True) $
+              when resume writeStateToFile
+                *> catchIO
+                  ( do
+                      dir <- getXMonadDataDir
+                      args <- getArgs
+                      executeFile (dir </> compiledConfig) False args Nothing
+                  )
+
+          main = launch defaultConfig
+              { modMask = mod4Mask -- Use Super instead of Alt
+              , terminal = "urxvt" }
+              `additionalKeys`
+              [ ( (mod4Mask,xK_r), compileRestart True)
+              , ( (mod4Mask,xK_q), restart "xmonad" True ) ]
+        '';
+      };
+
+      xmonadCliArgs = mkOption {
+        default = [];
+        type = with lib.types; listOf str;
+        description = ''
+          Command line arguments passed to the xmonad binary.
+        '';
+      };
+
+      ghcArgs = mkOption {
+        default = [];
+        type = with lib.types; listOf str;
+        description = ''
+          Command line arguments passed to the compiler (ghc)
+          invocation when xmonad.config is set.
+        '';
+      };
+
+    };
+  };
+  config = mkIf cfg.enable {
+    services.xserver.windowManager = {
+      session = [{
+        name = "xmonad";
+        start = ''
+           systemctl --user start --wait xmonad.service &
+           waitPID=$!
+        '';
+      }];
+    };
+
+    system.userActivationScripts.xmonad-reload = /* sh */ ''
+      if ${pkgs.systemd}/bin/systemctl --user is-active --quiet xmonad.service; then
+        if [ "$(readlink -f "$XDG_RUNTIME_DIR"/xmonad/xmonad)" != ${xmonad}/bin/xmonad ]; then
+          ${pkgs.systemd}/bin/systemctl --user reload xmonad.service
+        fi
+      fi
+    '';
+
+    systemd.user.services.xmonad = {
+      requisite = [ "graphical-session.target" ];
+      after = [ "graphical-session.target" ];
+      environment.PATH = mkForce "%t/xmonad";
+      environment.XMONAD_DATA_DIR = "%t/xmonad";
+      serviceConfig = rec {
+        ExecStartPre = [
+          "${pkgs.coreutils}/bin/mkdir -p %t/xmonad"
+          "${pkgs.coreutils}/bin/ln -fns ${xmonad}/bin/xmonad %t/xmonad/xmonad"
+        ];
+        ExecStart = "%t/xmonad/xmonad ${lib.escapeShellArgs cfg.xmonadCliArgs}";
+        ExecReload = ExecStartPre ++ [ "${xmonad-vanilla}/bin/xmonad --restart" ];
+      };
+    };
+
+    environment.systemPackages = [ xmonad ];
+  };
+}
-- 
cgit v1.2.3


From f6993b98450a703da75642ba2ca8cf05caf0c363 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 25 Jan 2021 03:09:50 +0100
Subject: tv AO753: use linux <5.9 because broadcom-sta

---
 tv/2configs/hw/AO753.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix
index d5b755cef..a91a5e518 100644
--- a/tv/2configs/hw/AO753.nix
+++ b/tv/2configs/hw/AO753.nix
@@ -21,6 +21,10 @@ with import <stockholm/lib>;
     "wl"
   ];
 
+  # broadcom_sta is marked as broken for 5.9+
+  # pkgs.linuxPackages_latest ist 5.9
+  boot.kernelPackages = pkgs.linuxPackages_5_8;
+
   boot.extraModulePackages = [
     config.boot.kernelPackages.broadcom_sta
   ];
-- 
cgit v1.2.3


From 0bee76d9092022d6dbb082516e8bdb42f7fcc8c8 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 26 Jan 2021 02:52:31 +0100
Subject: tv vim: prefer plugins to vim's own support files

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 4f961cd46..c0125ecfa 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -72,7 +72,7 @@ let {
     set mouse=a
     set noruler
     set pastetoggle=<INS>
-    set runtimepath=$VIMRUNTIME,${extra-runtimepath}
+    set runtimepath=${extra-runtimepath},$VIMRUNTIME
     set shortmess+=I
     set showcmd
     set showmatch
-- 
cgit v1.2.3


From 5d4e3a953e2c1f8a6c606640f7e8a94e4f64133d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 30 Jan 2021 12:12:13 +0100
Subject: nixpkgs: 85abeab -> 6e7f250

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

diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index b404cb6c9..d40e678cc 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "85abeab48b5feda4b163e5bb32f50aad1164e415",
-  "date": "2021-01-27T09:52:47+01:00",
-  "path": "/nix/store/la9l82nbilyhjjl2x294qpf7ki9lzkc3-nixpkgs",
-  "sha256": "1nslb5p6cf5z691pf52j8bf880sdgav1fcf7bxjk3rad92bniq5g",
+  "rev": "6e7f25001fe6874f7ae271891f709bbf50a22c45",
+  "date": "2021-01-29T09:54:18+01:00",
+  "path": "/nix/store/prpymxalqbhadpl734jpr4wsscj9hsvi-nixpkgs",
+  "sha256": "1x04j4351pqiqbpkq6g308mxcvb5aqnwv8l2vmlxkgvq5phzky7z",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
-- 
cgit v1.2.3


From 25505301ad773e5a1b569e2432b1e0d62815bcc5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 2 Feb 2021 22:28:25 +0100
Subject: htgen module: add package option

---
 krebs/3modules/htgen.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/krebs/3modules/htgen.nix b/krebs/3modules/htgen.nix
index 0dddca6c8..70c4fcd2b 100644
--- a/krebs/3modules/htgen.nix
+++ b/krebs/3modules/htgen.nix
@@ -20,6 +20,11 @@ let
           default = config._module.args.name;
         };
 
+        package = mkOption {
+          default = pkgs.htgen;
+          type = types.package;
+        };
+
         port = mkOption {
           type = types.uint;
         };
@@ -52,7 +57,7 @@ let
           User = htgen.user.name;
           PrivateTmp = true;
           Restart = "always";
-          ExecStart = "${pkgs.htgen}/bin/htgen --serve";
+          ExecStart = "${htgen.package}/bin/htgen --serve";
         };
       }
     ) cfg;
-- 
cgit v1.2.3


From 61aebc5adcab3a174a6e27686c0c8fc7f65df513 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 2 Feb 2021 22:46:39 +0100
Subject: bitlbee-facebook: init

---
 krebs/5pkgs/override/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/krebs/5pkgs/override/default.nix b/krebs/5pkgs/override/default.nix
index 7a7b979c4..926e9dccd 100644
--- a/krebs/5pkgs/override/default.nix
+++ b/krebs/5pkgs/override/default.nix
@@ -1,6 +1,15 @@
 with import <stockholm/lib>;
 self: super: {
 
+  bitlbee-facebook = super.bitlbee-facebook.overrideAttrs (old: {
+    src = self.fetchFromGitHub {
+      owner = "bitlbee";
+      repo = "bitlbee-facebook";
+      rev = "49ea312d98b0578b9b2c1ff759e2cfa820a41f4d";
+      sha256 = "0zg1p9pyfsdbfqac2qmyzcr6zjibwdn2907qgc808gljfx8bfnmk";
+    };
+  });
+
   flameshot = super.flameshot.overrideAttrs (old: rec {
     patches = old.patches or [] ++ [
       (self.writeText "flameshot-imgur.patch" /* diff */ ''
-- 
cgit v1.2.3


From afa01c0b0df5fda52276e6c29e6ae6565b50ed09 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 4 Feb 2021 14:11:42 +0100
Subject: tv fzf: add --complete-1

---
 tv/5pkgs/override/default.nix         |  7 +++++
 tv/5pkgs/override/fzf.complete1.patch | 55 +++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 tv/5pkgs/override/fzf.complete1.patch

diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix
index d18d66506..cf99e0377 100644
--- a/tv/5pkgs/override/default.nix
+++ b/tv/5pkgs/override/default.nix
@@ -1,5 +1,12 @@
 with import <stockholm/lib>;
 self: super: {
+  fzf = super.fzf.overrideAttrs (old: {
+    # XXX cannot use `patches` because fzf has a custom patchPhase
+    patchPhase = ''
+      patch -Np1 < ${./fzf.complete1.patch}
+      ${old.patchPhase}
+    '';
+  });
   input-fonts = super.input-fonts.overrideAttrs (old: rec {
     src = self.fetchurl {
       url = "http://xu.r/~tv/mirrors/input-fonts/Input-Font-2.zip";
diff --git a/tv/5pkgs/override/fzf.complete1.patch b/tv/5pkgs/override/fzf.complete1.patch
new file mode 100644
index 000000000..4b2126a2c
--- /dev/null
+++ b/tv/5pkgs/override/fzf.complete1.patch
@@ -0,0 +1,55 @@
+diff --git a/src/core.go b/src/core.go
+index a18c3a1..a3d92a4 100644
+--- a/src/core.go
++++ b/src/core.go
+@@ -331,6 +331,13 @@ func Run(opts *Options, version string, revision string) {
+ 							}
+ 						}
+ 						terminal.UpdateList(val, clearSelection())
++						if (opts.Complete1) {
++							count := val.Length()
++							if count == 1 {
++								opts.Printer(val.Get(0).item.AsString(opts.Ansi))
++								terminal.reqBox.Set(reqClose, nil)
++							}
++						}
+ 					}
+ 				}
+ 			}
+diff --git a/src/options.go b/src/options.go
+index a55dc34..7f121cd 100644
+--- a/src/options.go
++++ b/src/options.go
+@@ -92,6 +92,7 @@ const usage = `usage: fzf [options]
+     -1, --select-1        Automatically select the only match
+     -0, --exit-0          Exit immediately when there's no match
+     -f, --filter=STR      Filter mode. Do not start interactive finder.
++    --complete-1          Exit interactive finder when there's exactly one match
+     --print-query         Print query as the first line
+     --expect=KEYS         Comma-separated list of keys to complete fzf
+     --read0               Read input delimited by ASCII NUL characters
+@@ -208,6 +209,7 @@ type Options struct {
+ 	Query       string
+ 	Select1     bool
+ 	Exit0       bool
++	Complete1   bool
+ 	Filter      *string
+ 	ToggleSort  bool
+ 	Expect      map[tui.Event]string
+@@ -269,6 +271,7 @@ func defaultOptions() *Options {
+ 		Query:       "",
+ 		Select1:     false,
+ 		Exit0:       false,
++		Complete1:   false,
+ 		Filter:      nil,
+ 		ToggleSort:  false,
+ 		Expect:      make(map[tui.Event]string),
+@@ -1311,6 +1314,8 @@ func parseOptions(opts *Options, allArgs []string) {
+ 			opts.Exit0 = true
+ 		case "+0", "--no-exit-0":
+ 			opts.Exit0 = false
++		case "--complete-1":
++			opts.Complete1 = true
+ 		case "--read0":
+ 			opts.ReadZero = true
+ 		case "--no-read0":
-- 
cgit v1.2.3


From 161d5f2d964dadc848bc722fded69a75c9398b9d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 4 Feb 2021 17:56:36 +0100
Subject: brockman: 3.2.3 -> 3.2.4

---
 krebs/5pkgs/haskell/brockman.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/krebs/5pkgs/haskell/brockman.nix b/krebs/5pkgs/haskell/brockman.nix
index 5f1166a25..aec89b7ad 100644
--- a/krebs/5pkgs/haskell/brockman.nix
+++ b/krebs/5pkgs/haskell/brockman.nix
@@ -1,26 +1,26 @@
-{ mkDerivation, aeson, aeson-pretty, base, bloomfilter, bytestring
+{ mkDerivation, aeson, aeson-pretty, base, bytestring
 , case-insensitive, conduit, containers, directory, feed, filepath
-, hslogger, html-entity, http-client, irc-conduit, lens, network
-, optparse-applicative, random, safe, stdenv, text, time, timerep
-, wreq
+, hslogger, html-entity, http-client, irc-conduit, lens, lrucache
+, network, optparse-applicative, random, safe, stdenv, text, time
+, timerep, wreq
 , fetchFromGitHub
 }:
 mkDerivation rec {
   pname = "brockman";
-  version = "3.2.3";
+  version = "3.2.4";
   src = fetchFromGitHub {
     owner = "kmein";
     repo = "brockman";
     rev = version;
-    sha256 = "1qbjbf0l1ikfzmvky4cnvv7nlcwi2in4afliifh618j0a4f7j427";
+    sha256 = "1jh2i3rxbw8x0p5xs9ph95ixpsa6h6qm0msjb9xqnw9j8by2fkk2";
   };
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
-    aeson aeson-pretty base bloomfilter bytestring case-insensitive
-    conduit containers directory feed filepath hslogger html-entity
-    http-client irc-conduit lens network optparse-applicative random
-    safe text time timerep wreq
+    aeson aeson-pretty base bytestring case-insensitive conduit
+    containers directory feed filepath hslogger html-entity http-client
+    irc-conduit lens lrucache network optparse-applicative random safe
+    text time timerep wreq
   ];
   license = stdenv.lib.licenses.mit;
 }
-- 
cgit v1.2.3


From f21e8d00ad99f7ba47864c97222cb8f9b026ef46 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 4 Feb 2021 18:15:38 +0100
Subject: nixpkgs: 6e7f250 -> 90cec09

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

diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index d40e678cc..74a8665c8 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "6e7f25001fe6874f7ae271891f709bbf50a22c45",
-  "date": "2021-01-29T09:54:18+01:00",
-  "path": "/nix/store/prpymxalqbhadpl734jpr4wsscj9hsvi-nixpkgs",
-  "sha256": "1x04j4351pqiqbpkq6g308mxcvb5aqnwv8l2vmlxkgvq5phzky7z",
+  "rev": "90cec09c3642b9be6699015a35e404ecb503aa0d",
+  "date": "2021-02-02T17:56:41+01:00",
+  "path": "/nix/store/jrvfl6bw8fwb6sq8w4m6mhj26y52nhr7-nixpkgs",
+  "sha256": "0134xglcwrq8wp4mnxn6byww9pf2iipxghwpm92bdyknf79msdv1",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
-- 
cgit v1.2.3


From 61305cb1e2d93f72d49af7e51419ab77899cd54e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 4 Feb 2021 19:21:42 +0100
Subject: brockman: move to folder

---
 krebs/5pkgs/haskell/brockman.nix         | 26 --------------------------
 krebs/5pkgs/haskell/brockman/default.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 krebs/5pkgs/haskell/brockman.nix
 create mode 100644 krebs/5pkgs/haskell/brockman/default.nix

diff --git a/krebs/5pkgs/haskell/brockman.nix b/krebs/5pkgs/haskell/brockman.nix
deleted file mode 100644
index aec89b7ad..000000000
--- a/krebs/5pkgs/haskell/brockman.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty, base, bytestring
-, case-insensitive, conduit, containers, directory, feed, filepath
-, hslogger, html-entity, http-client, irc-conduit, lens, lrucache
-, network, optparse-applicative, random, safe, stdenv, text, time
-, timerep, wreq
-, fetchFromGitHub
-}:
-mkDerivation rec {
-  pname = "brockman";
-  version = "3.2.4";
-  src = fetchFromGitHub {
-    owner = "kmein";
-    repo = "brockman";
-    rev = version;
-    sha256 = "1jh2i3rxbw8x0p5xs9ph95ixpsa6h6qm0msjb9xqnw9j8by2fkk2";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson aeson-pretty base bytestring case-insensitive conduit
-    containers directory feed filepath hslogger html-entity http-client
-    irc-conduit lens lrucache network optparse-applicative random safe
-    text time timerep wreq
-  ];
-  license = stdenv.lib.licenses.mit;
-}
diff --git a/krebs/5pkgs/haskell/brockman/default.nix b/krebs/5pkgs/haskell/brockman/default.nix
new file mode 100644
index 000000000..aec89b7ad
--- /dev/null
+++ b/krebs/5pkgs/haskell/brockman/default.nix
@@ -0,0 +1,26 @@
+{ mkDerivation, aeson, aeson-pretty, base, bytestring
+, case-insensitive, conduit, containers, directory, feed, filepath
+, hslogger, html-entity, http-client, irc-conduit, lens, lrucache
+, network, optparse-applicative, random, safe, stdenv, text, time
+, timerep, wreq
+, fetchFromGitHub
+}:
+mkDerivation rec {
+  pname = "brockman";
+  version = "3.2.4";
+  src = fetchFromGitHub {
+    owner = "kmein";
+    repo = "brockman";
+    rev = version;
+    sha256 = "1jh2i3rxbw8x0p5xs9ph95ixpsa6h6qm0msjb9xqnw9j8by2fkk2";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    aeson aeson-pretty base bytestring case-insensitive conduit
+    containers directory feed filepath hslogger html-entity http-client
+    irc-conduit lens lrucache network optparse-applicative random safe
+    text time timerep wreq
+  ];
+  license = stdenv.lib.licenses.mit;
+}
-- 
cgit v1.2.3


From 9c2d517c498e1ea2fa27366d19dc01856fa136ee Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 4 Feb 2021 19:49:05 +0100
Subject: tv rxvt_unicode: use rawdiff instead of patch

When using patch, cgit will append its version to the output, causing
hashes to become invalid as it gets updated.
---
 tv/5pkgs/override/rxvt_unicode.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tv/5pkgs/override/rxvt_unicode.nix b/tv/5pkgs/override/rxvt_unicode.nix
index 4d9c3abc3..53aaf0658 100644
--- a/tv/5pkgs/override/rxvt_unicode.nix
+++ b/tv/5pkgs/override/rxvt_unicode.nix
@@ -3,15 +3,15 @@ rxvt_unicode.overrideAttrs (old: {
   patches = old.patches ++ [
     (fetchurl {
       name = "rxvt-unicode.cancel-running-selection-request.patch";
-      url = https://cgit.krebsco.de/rxvt-unicode/patch/?id=15f3f94;
-      sha256 = "12vldwsds27c9l15ffc6svk9mj17jhypcz736pvpmpqbsymlkz2p";
+      url = "https://cgit.krebsco.de/rxvt-unicode/rawdiff/?id=15f3f94&id2=15f3f94^";
+      sha256 = "1c7jq8phl85d2f581b4mc6fkmr2nv9n44qjjs4idi51sd2hs7sxw";
     })
 
     # Fix segfault when calling editor-input from XMonad.
     (fetchurl {
       name = "rxvt-unicode.no-perl_destruct.patch";
-      url = "https://cgit.krebsco.de/rxvt-unicode/patch/?id=d63f96a";
-      sha256 = "0i8nqrqgprv7cygflkrdp5zx75dv9bv84vrr2yc3vnfpqxamc43n";
+      url = "https://cgit.krebsco.de/rxvt-unicode/rawdiff/?id=d63f96a&id2=d63f96a^";
+      sha256 = "0fq9w4fq8mw05jk9bblzlh1x51m2cmk62xbc4c1mbiqagjmsi9f8";
     })
   ];
 })
-- 
cgit v1.2.3


From bbbd3d6cd89cc797fab9245decca62e05eb994b7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 5 Feb 2021 17:43:24 +0100
Subject: krebs.setuid: disambiguate `config`

---
 krebs/3modules/setuid.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/krebs/3modules/setuid.nix b/krebs/3modules/setuid.nix
index 97cf21cdd..3e068736b 100644
--- a/krebs/3modules/setuid.nix
+++ b/krebs/3modules/setuid.nix
@@ -1,11 +1,9 @@
-{ config, pkgs, lib, ... }:
 with import <stockholm/lib>;
-let
-  cfg = config.krebs.setuid;
+{ config, pkgs, ... }: let
 
   out = {
     options.krebs.setuid = api;
-    config = mkIf (cfg != {}) imp;
+    config = mkIf (config.krebs.setuid != {}) imp;
   };
 
   api = mkOption {
@@ -14,11 +12,11 @@ let
       # TODO make wrapperDir configurable
       inherit (config.security) wrapperDir;
       inherit (config.users) groups users;
-    in types.attrsOf (types.submodule ({ config, ... }: {
+    in types.attrsOf (types.submodule (self: let cfg = self.config; in {
       options = {
         name = mkOption {
           type = types.filename;
-          default = config._module.args.name;
+          default = cfg._module.args.name;
         };
         envp = mkOption {
           type = types.nullOr (types.attrsOf types.str);
@@ -58,21 +56,21 @@ let
         };
       };
       config.activate = let
-        src = pkgs.exec config.name {
-          inherit (config) envp filename;
+        src = pkgs.exec cfg.name {
+          inherit (cfg) envp filename;
         };
-        dst = "${wrapperDir}/${config.name}";
+        dst = "${wrapperDir}/${cfg.name}";
       in ''
         cp ${src} ${dst}
-        chown ${config.owner}.${config.group} ${dst}
-        chmod ${config.mode} ${dst}
+        chown ${cfg.owner}.${cfg.group} ${dst}
+        chmod ${cfg.mode} ${dst}
       '';
     }));
   };
 
   imp = {
     system.activationScripts."krebs.setuid" = stringAfter [ "wrappers" ]
-      (concatMapStringsSep "\n" (getAttr "activate") (attrValues cfg));
+      (concatMapStringsSep "\n" (getAttr "activate") (attrValues config.krebs.setuid));
   };
 
 in out
-- 
cgit v1.2.3


From 315dcf3cbff0980495c0899a38ecdf538651dabc Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 5 Feb 2021 17:48:54 +0100
Subject: krebs.setuid: make wrapperDir configurable

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

diff --git a/krebs/3modules/setuid.nix b/krebs/3modules/setuid.nix
index 3e068736b..64fedb911 100644
--- a/krebs/3modules/setuid.nix
+++ b/krebs/3modules/setuid.nix
@@ -9,8 +9,6 @@ with import <stockholm/lib>;
   api = mkOption {
     default = {};
     type = let
-      # TODO make wrapperDir configurable
-      inherit (config.security) wrapperDir;
       inherit (config.users) groups users;
     in types.attrsOf (types.submodule (self: let cfg = self.config; in {
       options = {
@@ -49,6 +47,10 @@ with import <stockholm/lib>;
             merge = mergeOneOption;
           };
         };
+        wrapperDir = mkOption {
+          default = config.security.wrapperDir;
+          type = types.absolute-pathname;
+        };
         activate = mkOption {
           type = types.str;
           visible = false;
@@ -59,8 +61,9 @@ with import <stockholm/lib>;
         src = pkgs.exec cfg.name {
           inherit (cfg) envp filename;
         };
-        dst = "${wrapperDir}/${cfg.name}";
+        dst = "${cfg.wrapperDir}/${cfg.name}";
       in ''
+        mkdir -p ${cfg.wrapperDir}
         cp ${src} ${dst}
         chown ${cfg.owner}.${cfg.group} ${dst}
         chmod ${cfg.mode} ${dst}
-- 
cgit v1.2.3


From 1ff4a60b8d241230c580fc5e9a705335c9c415a6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 5 Feb 2021 19:52:07 +0100
Subject: krebs.shadow: admit password changes

---
 krebs/3modules/shadow.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/krebs/3modules/shadow.nix b/krebs/3modules/shadow.nix
index cff66492d..9505efb0c 100644
--- a/krebs/3modules/shadow.nix
+++ b/krebs/3modules/shadow.nix
@@ -4,19 +4,21 @@ with import <stockholm/lib>;
   cfg = config.krebs.shadow;
 
   mergeShadowsJq = pkgs.writeJq "merge-shadows.jq" ''
-    def fields_3_to_9: ["1", "", "", "", "", "", ""];
+    def is_int: . == (. | floor);
+    def fields_4_to_9: ["", "", "", "", "", ""];
+    def check_fields_3_to_9: (.[2] | tonumber | is_int) and .[3:] == fields_4_to_9;
 
     def read_value:
       split(":") |
       if length == 9 then
-        if .[2:] == fields_3_to_9 then
+        if check_fields_3_to_9 then
           .
         else
           error("unrecognized field contents")
         end
       elif length == 2 then
         if .[1] | test("^\\$6\\$") then
-          . + fields_3_to_9
+          . + ["1"] + fields_4_to_9
         else
           error("unrecognized hashed password")
         end
-- 
cgit v1.2.3


From a94d2ce6c7e83ecb0337affd91200c4774ba7920 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 7 Feb 2021 21:52:37 +0100
Subject: tv xdpytools: init

---
 tv/5pkgs/simple/xdpytools/default.nix  | 31 +++++++++++++++++++++
 tv/5pkgs/simple/xdpytools/src/xdpychvt | 11 ++++++++
 tv/5pkgs/simple/xdpytools/src/xdpysel  | 49 ++++++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 tv/5pkgs/simple/xdpytools/default.nix
 create mode 100755 tv/5pkgs/simple/xdpytools/src/xdpychvt
 create mode 100755 tv/5pkgs/simple/xdpytools/src/xdpysel

diff --git a/tv/5pkgs/simple/xdpytools/default.nix b/tv/5pkgs/simple/xdpytools/default.nix
new file mode 100644
index 000000000..7d1ee071e
--- /dev/null
+++ b/tv/5pkgs/simple/xdpytools/default.nix
@@ -0,0 +1,31 @@
+{ lib, pkgs }:
+
+let
+  install = name: { path }: /* sh */ ''
+    (
+      mkdir -p $out/bin
+      touch $out/bin/${name}
+      chmod +x $out/bin/${name}
+      exec >$out/bin/${name}
+
+      echo '#! ${pkgs.dash}/bin/dash'
+      echo export PATH=${lib.makeBinPath path}
+      sed 1d ${./src + "/${name}"}
+    )
+  '';
+in
+
+pkgs.runCommand "xdpytools" {}
+  (toString
+    (lib.mapAttrsToList install {
+      xdpychvt.path = [
+        "$out"
+        "/run/wrappers/'$LOGNAME'"
+        "/run/wrappers"
+      ];
+      xdpysel.path = [
+        "$out"
+        pkgs.findutils
+        pkgs.jq
+      ];
+    }))
diff --git a/tv/5pkgs/simple/xdpytools/src/xdpychvt b/tv/5pkgs/simple/xdpytools/src/xdpychvt
new file mode 100755
index 000000000..84c1907b9
--- /dev/null
+++ b/tv/5pkgs/simple/xdpytools/src/xdpychvt
@@ -0,0 +1,11 @@
+#! /bin/sh
+# usage: xdpychvt {prev,next}
+# Changes to the VT based on the selected X display.
+#
+# This allows switching between X servers when display names and VT numbers
+# correlate.  A more sophisticated tool would try to determine the correct VT
+# by e.g. looking at /proc, but this might not possible when e.g.  using
+# security.hideProcessInformation.
+#
+
+chvt "$(xdpysel "$1")"
diff --git a/tv/5pkgs/simple/xdpytools/src/xdpysel b/tv/5pkgs/simple/xdpytools/src/xdpysel
new file mode 100755
index 000000000..e08015576
--- /dev/null
+++ b/tv/5pkgs/simple/xdpytools/src/xdpysel
@@ -0,0 +1,49 @@
+#! /bin/sh
+# usage: xdpysel {prev,next}
+# Print the number of the selected X display.
+
+find /tmp/.X11-unix -mindepth 1 -maxdepth 1 |
+jq -Rrs --arg command "$1" '
+  (
+    split("\n") |
+    map(
+      select(.!="") |
+      match("^.*/X([0-9]+)$").captures[0].string |
+      tonumber
+    )
+  )
+    as $all_displays |
+
+  (
+    env.DISPLAY |
+    match("^:([0-9]+)(?:[.][0-9]+)?$").captures[0].string |
+    tonumber
+  )
+    as $current_display |
+
+  ($all_displays | length) as $all_displays_count |
+
+  ($all_displays|index($current_display))
+    as $current_index |
+
+  (($current_index + 1) % $all_displays_count)
+    as $next_index |
+
+  (($all_displays_count + $current_index - 1) % $all_displays_count)
+    as $prev_index |
+
+  $all_displays[$prev_index] as $prev_display |
+  $all_displays[$next_index] as $next_display |
+
+  {
+    prev: $prev_display,
+    next: $next_display,
+  }[$command]
+    as $result |
+
+  if $result | type == "number" then
+    $result
+  else
+    "xdpysel: bad argument: \($command)\n" | halt_error(-1)
+  end
+'
-- 
cgit v1.2.3


From bda725bbfc4a4e1ecf8a8fd8d3dbff69b5cf4d60 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 7 Feb 2021 22:28:50 +0100
Subject: tv xmonad: integrate xdpychvt

---
 tv/5pkgs/haskell/xmonad-tv/src/Paths.hs | 3 +++
 tv/5pkgs/haskell/xmonad-tv/src/main.hs  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs b/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
index 6b7235530..b2ad01ae7 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
@@ -29,3 +29,6 @@ urxvtc = findExecutable "urxvtc"
 
 xcalib :: FilePath
 xcalib = findExecutable "xcalib"
+
+xdpychvt :: FilePath
+xdpychvt = findExecutable "xdpychvt"
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
index 50b03d81c..e5a4473fe 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
@@ -190,6 +190,9 @@ myKeys conf = Map.fromList $
     , ((_4, xK_Prior), forkFile Paths.xcalib ["-invert", "-alter"] Nothing)
 
     , ((0, xK_Print), forkFile Paths.flameshot [] Nothing)
+
+    , ((_C, xF86XK_Forward), forkFile Paths.xdpychvt ["next"] Nothing)
+    , ((_C, xF86XK_Back), forkFile Paths.xdpychvt ["prev"] Nothing)
     ]
     where
     _4 = mod4Mask
-- 
cgit v1.2.3


From bd7f002fefc7acd01b1248a995854891d8520b71 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 10 Feb 2021 15:50:28 +0100
Subject: news: let candyman react to his name

---
 krebs/2configs/news.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix
index 7f4020ca2..ce4e83408 100644
--- a/krebs/2configs/news.nix
+++ b/krebs/2configs/news.nix
@@ -39,10 +39,12 @@
     };
   };
 
-  krebs.reaktor2.news = {
+  krebs.reaktor2.news = let
+    name = "candyman";
+  in {
     hostname = "localhost";
     port = "6667";
-    nick = "candyman";
+    nick = name;
     plugins = [
       {
         plugin = "register";
@@ -60,14 +62,14 @@
           hooks.PRIVMSG = [
             {
               activate = "match";
-              pattern = "^brockman-helper:\\s*(\\S*)(?:\\s+(.*\\S))?\\s*$";
+              pattern = "^${name}:\\s*(\\S*)(?:\\s+(.*\\S))?\\s*$";
               command = 1;
               arguments = [2];
               commands = {
                 add-reddit.filename = pkgs.writeDash "add-reddit" ''
                   set -euf
                   if [ "$#" -ne 1 ]; then
-                    echo 'usage: brockman-helper: add-reddit $reddit_channel'
+                    echo 'usage: ${name}: add-reddit $reddit_channel'
                     exit 1
                   fi
                   reddit_channel=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
@@ -76,7 +78,7 @@
                 add-telegram.filename = pkgs.writeDash "add-telegram" ''
                   set -euf
                   if [ "$#" -ne 1 ]; then
-                    echo 'usage: brockman-helper: add-telegram $telegram_user'
+                    echo 'usage: ${name}: add-telegram $telegram_user'
                     exit 1
                   fi
                   telegram_user=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
@@ -85,7 +87,7 @@
                 add-youtube.filename = pkgs.writeDash "add-youtube" ''
                   set -euf
                   if [ "$#" -ne 1 ]; then
-                    echo 'usage: brockman-helper: add-youtube $nick $channelid'
+                    echo 'usage: ${name}: add-youtube $nick $channelid'
                     exit 1
                   fi
                   youtube_nick=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
@@ -95,7 +97,7 @@
                 search.filename = pkgs.writeDash "search" ''
                   set -euf
                   if [ "$#" -ne 1 ]; then
-                    echo 'usage: brockman-helper: search $searchterm'
+                    echo 'usage: ${name}: search $searchterm'
                     exit 1
                   fi
                   searchterm=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
-- 
cgit v1.2.3


From f32fcc3e4a23b4883bcf8d470041e88fc04e7e4c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 10 Feb 2021 15:50:55 +0100
Subject: brockman module: wait 5 sec when restarting

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

diff --git a/krebs/3modules/brockman.nix b/krebs/3modules/brockman.nix
index 32aa3489b..9b2ed4a71 100644
--- a/krebs/3modules/brockman.nix
+++ b/krebs/3modules/brockman.nix
@@ -29,6 +29,7 @@ in {
         PrivateTmp = true;
         RuntimeDirectory = "brockman";
         WorkingDirectory = "%t/brockman";
+        RestartSec = 5;
       };
     };
   };
-- 
cgit v1.2.3


From ce0393f43aab8928c783276ac6d14e92f754391b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 10 Feb 2021 15:58:59 +0100
Subject: brockman: 3.2.4 -> 3.4.0

---
 krebs/5pkgs/haskell/brockman/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/krebs/5pkgs/haskell/brockman/default.nix b/krebs/5pkgs/haskell/brockman/default.nix
index aec89b7ad..92051a025 100644
--- a/krebs/5pkgs/haskell/brockman/default.nix
+++ b/krebs/5pkgs/haskell/brockman/default.nix
@@ -1,26 +1,26 @@
 { mkDerivation, aeson, aeson-pretty, base, bytestring
 , case-insensitive, conduit, containers, directory, feed, filepath
-, hslogger, html-entity, http-client, irc-conduit, lens, lrucache
-, network, optparse-applicative, random, safe, stdenv, text, time
-, timerep, wreq
+, hashable, hslogger, html-entity, http-client, irc-conduit, lens
+, lrucache, lrucaching, network, optparse-applicative, random, safe
+, stdenv, text, time, timerep, wreq
 , fetchFromGitHub
 }:
 mkDerivation rec {
   pname = "brockman";
-  version = "3.2.4";
+  version = "3.4.0";
   src = fetchFromGitHub {
     owner = "kmein";
     repo = "brockman";
     rev = version;
-    sha256 = "1jh2i3rxbw8x0p5xs9ph95ixpsa6h6qm0msjb9xqnw9j8by2fkk2";
+    sha256 = "02nval6a9xcddj6znzxvcb8g6klzjydj1lb4ych64i9mr4a8jvic";
   };
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
     aeson aeson-pretty base bytestring case-insensitive conduit
-    containers directory feed filepath hslogger html-entity http-client
-    irc-conduit lens lrucache network optparse-applicative random safe
-    text time timerep wreq
+    containers directory feed filepath hashable hslogger html-entity
+    http-client irc-conduit lens lrucache lrucaching network
+    optparse-applicative random safe text time timerep wreq
   ];
   license = stdenv.lib.licenses.mit;
 }
-- 
cgit v1.2.3


From d462900b7a9a38b18ab08f831efc6d30343e9a78 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 10 Feb 2021 15:59:36 +0100
Subject: rss-bridge: 2020-11-10 -> unstable-2021-01-10

---
 krebs/5pkgs/simple/rss-bridge/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/krebs/5pkgs/simple/rss-bridge/default.nix b/krebs/5pkgs/simple/rss-bridge/default.nix
index 13ad9d69a..bbe5c1bdb 100644
--- a/krebs/5pkgs/simple/rss-bridge/default.nix
+++ b/krebs/5pkgs/simple/rss-bridge/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rss-bridge";
-  version = "2020-11-10";
+  version = "unstable-2021-01-10";
 
   src = fetchFromGitHub {
     owner = "RSS-Bridge";
     repo = "rss-bridge";
-    rev = version;
-    sha256 = "00cp61lqvhi7b7j0rglsqg3l7cg8s9b8vq098bgvg5dygyi44hyv";
+    rev = "98352845a14b9f2eb8925ad7a04a5f6cc6a5af06";
+    sha256 = "1nv1f6f17cn057k9mydd3a0bmj2xa5k410fdq7nhw5b7msyxy2qv";
   };
 
   patchPhase = ''
-- 
cgit v1.2.3


From 9d18a8a108e2b3578ebd20b8de9ff01bb9f22930 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 10 Feb 2021 16:01:27 +0100
Subject: l tdlib-purple: 0.7.6 -> 0.7.8

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

diff --git a/lass/5pkgs/tdlib-purple/default.nix b/lass/5pkgs/tdlib-purple/default.nix
index 445839a4b..54841588e 100644
--- a/lass/5pkgs/tdlib-purple/default.nix
+++ b/lass/5pkgs/tdlib-purple/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tdlib-purple";
-  version = "0.7.6";
+  version = "0.7.8";
 
   src = fetchFromGitHub {
     owner = "ars3niy";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1inamfzbrz0sy4y431jgwjfg6lz14a7c71khrg02481raxchhzzf";
+    sha256 = "17g54mcxsidcx37l6m4p8i06ln1hvq3347dhdl9xkkn7pqpwvv1c";
   };
 
   cmakeFlags = [
-- 
cgit v1.2.3


From 7c194fff54ddd96b9ec34de8225e2d76663b4a8b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 10 Feb 2021 16:03:12 +0100
Subject: l yellow.r: enable jellyfin

---
 lass/1systems/yellow/config.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lass/1systems/yellow/config.nix b/lass/1systems/yellow/config.nix
index 1afad003c..178a5adf1 100644
--- a/lass/1systems/yellow/config.nix
+++ b/lass/1systems/yellow/config.nix
@@ -152,10 +152,11 @@ with import <stockholm/lib>;
   krebs.iptables = {
     enable = true;
     tables.filter.INPUT.rules = [
-      { predicate = "-p tcp --dport 80"; target = "ACCEPT"; }
-      { predicate = "-p tcp --dport 9091"; target = "ACCEPT"; }
-      { predicate = "-p tcp --dport 51413"; target = "ACCEPT"; }
-      { predicate = "-p udp --dport 51413"; target = "ACCEPT"; }
+      { predicate = "-p tcp --dport 80"; target = "ACCEPT"; } # nginx web dir
+      { predicate = "-p tcp --dport 9091"; target = "ACCEPT"; } # transmission-web
+      { predicate = "-p tcp --dport 51413"; target = "ACCEPT"; } # transmission-traffic
+      { predicate = "-p udp --dport 51413"; target = "ACCEPT"; } # transmission-traffic
+      { predicate = "-p tcp --dport 8096"; target = "ACCEPT"; } # jellyfin
     ];
   };
 
@@ -265,4 +266,9 @@ with import <stockholm/lib>;
       '';
     };
   };
+
+  services.jellyfin = {
+    enable = true;
+    group = "download";
+  };
 }
-- 
cgit v1.2.3


From f3b9a51ea442530c10e49878b68fe8442d70bbd0 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 10 Feb 2021 16:05:53 +0100
Subject: nixpkgs: 90cec09 -> d4c29df

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

diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 74a8665c8..2e0b0257b 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "90cec09c3642b9be6699015a35e404ecb503aa0d",
-  "date": "2021-02-02T17:56:41+01:00",
-  "path": "/nix/store/jrvfl6bw8fwb6sq8w4m6mhj26y52nhr7-nixpkgs",
-  "sha256": "0134xglcwrq8wp4mnxn6byww9pf2iipxghwpm92bdyknf79msdv1",
+  "rev": "d4c29df154dc6397ea47a7ed7dd0450a46dd4695",
+  "date": "2021-02-08T22:02:05+01:00",
+  "path": "/nix/store/sbgnjrs0f1dqyqlmk2bm4wxgsy6pgjqp-nixpkgs",
+  "sha256": "015xcdirr9vh49dszgfb2rayr6mqscmmv2d3dh99ghv8gjcv050y",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
-- 
cgit v1.2.3


From 90782e21f8afd89aa408b2e9ea930a52c9d37889 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 10 Feb 2021 21:48:58 +0100
Subject: nixpkgs-unstable: f217c0e -> 8c87313

---
 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 321fafac6..57d30799b 100644
--- a/krebs/nixpkgs-unstable.json
+++ b/krebs/nixpkgs-unstable.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "f217c0ea7c148ddc0103347051555c7c252dcafb",
-  "date": "2021-01-21T09:50:34+01:00",
-  "path": "/nix/store/8srlzkkvbvlg4g585g9iyzd3ryiilm8a-nixpkgs",
-  "sha256": "0cyksxg2lnzxd0pss09rmmk2c2axz0lf9wvgvfng59nwf8dpq2kf",
+  "rev": "8c8731330b53ba0061686f36f10f101e662a4717",
+  "date": "2021-02-08T20:46:59+01:00",
+  "path": "/nix/store/agilvsqqdsqx36wf4zkq5gnhnab47qpd-nixpkgs",
+  "sha256": "0ak4d254myq6cl3d7jkq6n0apxabvwjz62zdw9habnrqg8asl8gk",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
-- 
cgit v1.2.3


From 5d0c18a7f62646ab80c8d191a7aaa9ccefc04df8 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 10 Feb 2021 23:28:30 +0100
Subject: home-assistant: import from unstable

---
 krebs/5pkgs/simple/home-assistant.nix | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 krebs/5pkgs/simple/home-assistant.nix

diff --git a/krebs/5pkgs/simple/home-assistant.nix b/krebs/5pkgs/simple/home-assistant.nix
new file mode 100644
index 000000000..58a6edf33
--- /dev/null
+++ b/krebs/5pkgs/simple/home-assistant.nix
@@ -0,0 +1,8 @@
+{ pkgs, lib, ... }: let
+  unstable = pkgs.fetchFromGitHub {
+    owner = "nixos";
+    repo = "nixpkgs";
+    rev = (lib.importJSON ../../nixpkgs-unstable.json).rev;
+    sha256 = (lib.importJSON ../../nixpkgs-unstable.json).sha256;
+  };
+in (import unstable {}).home-assistant
-- 
cgit v1.2.3


From f0e8399b81b911da6c88d7af442bc305a1827c66 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 11 Feb 2021 11:07:58 +0100
Subject: nixpkgs: d4c29df -> 2394284

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

diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 2e0b0257b..8670999e0 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "d4c29df154dc6397ea47a7ed7dd0450a46dd4695",
-  "date": "2021-02-08T22:02:05+01:00",
-  "path": "/nix/store/sbgnjrs0f1dqyqlmk2bm4wxgsy6pgjqp-nixpkgs",
-  "sha256": "015xcdirr9vh49dszgfb2rayr6mqscmmv2d3dh99ghv8gjcv050y",
+  "rev": "2394284537b89471c87065b040d3dedd8b5907fe",
+  "date": "2021-02-10T23:24:22+01:00",
+  "path": "/nix/store/rqgraycidchn5wc5mki5sqj8bl5cpx78-nixpkgs",
+  "sha256": "1j7vp735is5d32mbrgavpxi3fbnsm6d99a01ap8gn30n5ysd14sl",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
-- 
cgit v1.2.3


From 438567e9b1cad51515791023a424d1b5773e148f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 4 Feb 2021 14:00:44 +0100
Subject: mic92: add grandalf to tinc

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

diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix
index 29d0b27fa..76f7d9b09 100644
--- a/krebs/3modules/external/mic92.nix
+++ b/krebs/3modules/external/mic92.nix
@@ -453,6 +453,29 @@ in {
         };
       };
     };
+
+    grandalf = {
+      owner = config.krebs.users.mic92;
+      nets = {
+        retiolum = {
+          ip4.addr = "10.243.29.187";
+          aliases = [
+            "grandalf.r"
+          ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----                                      
+            MIIBCgKCAQEAn1wLOI8DluJAKvscyImoyG0gjxyVC1/Ky8A63YO7INy0SYBg3wU7    
+            XPSbix5VJZdADQ382LWg31ORYjnDg40c49gCGLfR6+awgd+Rb0sb4eAz07XENXJC    
+            qc70oQrrXLi8HIfeckCsJHe514LJOMA3pU+muaMShOiSygoTiTlEH6RRrkC8HROL    
+            2/V7Hm2Sg7YS+MY8bI/x61MIagfkQKH2eFyqGG54Y80bIhm5SohMkiANu78GdngI    
+            jb+EGlT/vq3+oGNFJ7Shy/VsR5GLDoZ5KCsT45DM87lOjGB7m+bOdizZQtWmJtC/    
+            /btEPWJPAD9lIY2iGtPrmeMWDNTW9c0iCwIDAQAB                            
+            -----END RSA PUBLIC KEY-----                                        
+          '';
+        };
+      };
+    };
+
     eva = {
       owner = config.krebs.users.mic92;
       nets = rec {
-- 
cgit v1.2.3


From b879ccaeb92b6ee725719c53d93a53427d984a2f Mon Sep 17 00:00:00 2001
From: Harshavardhan Unnibhavi <harshanavkis@gmail.com>
Date: Thu, 4 Feb 2021 16:26:03 +0000
Subject: Add redha to tinc

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

diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix
index 76f7d9b09..3d5672b00 100644
--- a/krebs/3modules/external/mic92.nix
+++ b/krebs/3modules/external/mic92.nix
@@ -453,6 +453,28 @@ in {
         };
       };
     };
+    
+    redha = {
+      owner = config.krebs.users.mic92;
+      nets = {
+        retiolum = {
+          ip4.addr = "10.243.29.188";
+          aliases = [
+            "redha.r"
+          ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----
+            MIIBCgKCAQEAx7STxTTPMxXugweHpUGOeLUrrTSCt7j5l+fjNtArIygOGKEiAC5O
+            s0G4WHK2IcrNnv7pxS09S5mnXywi51aAL+G2fKzcU3YgLFuoUN4Kk5LohMvBynEE
+            a3kZK2/D+LMeFfpK2RWBPjLnulN29ke11Iot42TC6+NIMWiZh/Y2T0mKirUJQGsH
+            RV3zRlR7YfIOdR1AZ5S+qrmPF8hLb7O08TTXrHo8NQk5NAVUS89OYcn1pc9hnf/e
+            FK5qRrQFMRFB8KGV+n3+cx3XCM2q0ZPTNf06N+Usx6vTKLASa/4GaTcbBx+9Dndm
+            mFVWq9JjLa8e65tojzj8PhmgxqaNCf8aKwIDAQAB
+            -----END RSA PUBLIC KEY-----
+          '';
+        };
+      };
+    };
 
     grandalf = {
       owner = config.krebs.users.mic92;
-- 
cgit v1.2.3


From dd6a591c752696b2238a7f7df94614551a88842e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 8 Feb 2021 11:59:58 +0100
Subject: mic92: init dimitrios-desktop

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

diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix
index 3d5672b00..e45367a54 100644
--- a/krebs/3modules/external/mic92.nix
+++ b/krebs/3modules/external/mic92.nix
@@ -97,6 +97,27 @@ in {
         };
       };
     };
+    dimitrios-desktop = {
+      owner = config.krebs.users.mic92;
+      nets = {
+        retiolum = {
+          ip4.addr = "10.243.29.189";
+          aliases = [
+            "dimitrios-desktop.r"
+          ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----
+            MIIBCgKCAQEAz9aKIhzk8+ZNBQmU054yc1yTdMyaw1aqWXYyQZoCmFaBIlMvF8I0
+            dd+56cGjK8O7KkEhheDL/ijj9cCcxbqHSTktXz47ScyTaN63h13+MBUIUzDwSO4E
+            9fRUUn3lbZenhGoON7hlaHb/qAR0yLxip0Tw77bcq4hvKleD74NnAJILPoP1KRDY
+            O5vs8C8wpdJUtnlsfkAa058wDI+7GNPb0cs0/pBQVR2GUGb1xqVJ5obO/lFKOJ/e
+            DKemnlg736cEaIF6v9M+w4VmL8mNudDy6RxA6/xIErP5Ru2aK5lH5UBHVCwdLLCy
+            8y3It9Tgji3G9nOFbhaeKDjeIAJ8sG+WjQIDAQAB
+            -----END RSA PUBLIC KEY-----
+          '';
+        };
+      };
+    };
     donna = {
       owner = config.krebs.users.mic92;
       nets = rec {
-- 
cgit v1.2.3


From b144f7150a50800d498f257873891c9b03b38bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 8 Feb 2021 12:22:39 +0100
Subject: mic92: fix tinc name

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

diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix
index e45367a54..d4b2e4633 100644
--- a/krebs/3modules/external/mic92.nix
+++ b/krebs/3modules/external/mic92.nix
@@ -97,13 +97,13 @@ in {
         };
       };
     };
-    dimitrios-desktop = {
+    dimitriosxps = {
       owner = config.krebs.users.mic92;
       nets = {
         retiolum = {
           ip4.addr = "10.243.29.189";
           aliases = [
-            "dimitrios-desktop.r"
+            "dimitriosxps.r"
           ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC