Merge remote-tracking branch 'prism/master'

32 files changed, 305 insertions, 212 deletions

diff --git a/lass/2configs/IM.nix b/lass/2configs/IM.nix
index 5108f6bc1..5b8cebf5c 100644
--- a/lass/2configs/IM.nix
+++ b/lass/2configs/IM.nix
@@ -30,7 +30,7 @@ in {
   imports = [
     ./bitlbee.nix
   ];
-  environment.systemPackages = [ tmux ];
+  environment.systemPackages = [ tmux weechat ];
   systemd.services.chat = {
     description = "chat environment setup";
     after = [ "network.target" ];
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 23eaa2802..124eef2cf 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -11,6 +11,7 @@ in {
     ./xdg-open.nix
     ./yubikey.nix
     ./pipewire.nix
+    ./tmux.nix
     ./xmonad.nix
     {
       krebs.per-user.lass.packages = [
@@ -61,7 +62,8 @@ in {
     font-size
     fzfmenu
     gimp
-    gitAndTools.qgit
+    gitAndTools.hub
+    git-crypt
     git-preview
     gnome3.dconf
     iodine
@@ -85,6 +87,7 @@ in {
     xorg.xhost
     xsel
     zathura
+    flameshot-once
     (pkgs.writeDashBin "screenshot" ''
       set -efu
 
diff --git a/lass/2configs/bepasty.nix b/lass/2configs/bepasty.nix
deleted file mode 100644
index 9bd416c05..000000000
--- a/lass/2configs/bepasty.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
-
-# secrets used:
-#   wildcard.krebsco.de.crt
-#   wildcard.krebsco.de.key
-#   bepasty-secret.nix     <- contains single string
-
-with import <stockholm/lib>;
-let
-  secKey = import <secrets/bepasty-secret.nix>;
-  ext-doms = [
-    "paste.lassul.us"
-    "paste.krebsco.de"
-  ];
-in {
-
-  services.nginx.enable = mkDefault true;
-  krebs.bepasty = {
-    enable = true;
-    serveNginx= true;
-
-    servers = {
-      "paste.r" = {
-        nginx = {
-          serverAliases = [
-            "paste.${config.krebs.build.host.name}"
-            "paste.r"
-          ];
-        };
-        defaultPermissions = "admin,list,create,read,delete";
-        secretKey = secKey;
-      };
-    } //
-    genAttrs ext-doms (ext-dom: {
-      nginx = {
-        forceSSL = true;
-        enableACME = true;
-      };
-      defaultPermissions = "read,create";
-      secretKey = secKey;
-    });
-  };
-}
diff --git a/lass/2configs/binary-cache/server.nix b/lass/2configs/binary-cache/server.nix
index 101dd045f..baa891821 100644
--- a/lass/2configs/binary-cache/server.nix
+++ b/lass/2configs/binary-cache/server.nix
@@ -29,6 +29,13 @@
       locations."/".extraConfig = ''
         proxy_pass http://localhost:${toString config.services.nix-serve.port};
       '';
+      locations."= /nix-cache-info".extraConfig = ''
+        alias ${pkgs.writeText "cache-info" ''
+          StoreDir: /nix/store
+          WantMassQuery: 1
+          Priority: 42
+        ''};
+      '';
     };
     virtualHosts."cache.krebsco.de" = {
       forceSSL = true;
diff --git a/lass/2configs/blue.nix b/lass/2configs/blue.nix
index 15408a200..28c7d640d 100644
--- a/lass/2configs/blue.nix
+++ b/lass/2configs/blue.nix
@@ -2,16 +2,13 @@ with (import <stockholm/lib>);
 { config, lib, pkgs, ... }:
 
 {
-
   imports = [
-    ./bitlbee.nix
     ./mail.nix
     ./pass.nix
   ];
 
   environment.systemPackages = with pkgs; [
     ag
-    brain
     dic
     nmap
     git-preview
@@ -30,43 +27,6 @@ with (import <stockholm/lib>);
     { predicate = "-i wiregrill -p tcp --dport imap"; target = "ACCEPT";}
   ];
 
-  systemd.services.chat = let
-    tmux = pkgs.writeDash "tmux" ''
-      exec ${pkgs.tmux}/bin/tmux -f ${pkgs.writeText "tmux.conf" ''
-        set-option -g prefix `
-        unbind-key C-b
-        bind ` send-prefix
-
-        set-option -g status off
-        set-option -g default-terminal screen-256color
-
-        #use session instead of windows
-        bind-key c new-session
-        bind-key p switch-client -p
-        bind-key n switch-client -n
-        bind-key C-s switch-client -l
-      ''} "$@"
-    '';
-  in {
-    description = "chat environment setup";
-    after = [ "network.target" ];
-    wantedBy = [ "multi-user.target" ];
-
-    restartIfChanged = false;
-
-    path = [
-      pkgs.rxvt_unicode.terminfo
-    ];
-
-    serviceConfig = {
-      User = "lass";
-      RemainAfterExit = true;
-      Type = "oneshot";
-      ExecStart = "${tmux} -2 new-session -d -s IM ${pkgs.weechat}/bin/weechat";
-      ExecStop = "${tmux} kill-session -t IM";
-    };
-  };
-
   services.dovecot2 = {
     enable = true;
     mailLocation = "maildir:~/Maildir";
diff --git a/lass/2configs/codimd.nix b/lass/2configs/codimd.nix
index 070781a31..271dcfca4 100644
--- a/lass/2configs/codimd.nix
+++ b/lass/2configs/codimd.nix
@@ -1,8 +1,16 @@
 { config, pkgs, lib, ... }:
 with import <stockholm/lib>;
 let
-  domain = "codi.lassul.us";
+  domain = "pad.lassul.us";
 in {
+
+  # redirect legacy domain to new one
+  services.nginx.virtualHosts."codi.lassul.us" = {
+    enableACME = true;
+    addSSL = true;
+    locations."/".return = "301 https://${domain}\$request_uri";
+  };
+
   services.nginx.virtualHosts.${domain} = {
     enableACME = true;
     forceSSL = true;
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index eb38d0e97..c3fbc2093 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -19,10 +19,9 @@ with import <stockholm/lib>;
       users.extraUsers = {
         root = {
           openssh.authorizedKeys.keys = [
-            config.krebs.users.lass-mors.pubkey
+            config.krebs.users.lass.pubkey
             config.krebs.users.lass-blue.pubkey
             config.krebs.users.lass-green.pubkey
-            config.krebs.users.lass-yubikey.pubkey
           ];
         };
         mainUser = {
@@ -35,25 +34,17 @@ with import <stockholm/lib>;
           isNormalUser = true;
           extraGroups = [
             "audio"
+            "video"
             "fuse"
             "wheel"
           ];
           openssh.authorizedKeys.keys = [
-            config.krebs.users.lass-mors.pubkey
+            config.krebs.users.lass.pubkey
             config.krebs.users.lass-blue.pubkey
             config.krebs.users.lass-green.pubkey
-            config.krebs.users.lass-yubikey.pubkey
-          ];
-        };
-        nix = {
-          isNormalUser = true;
-          uid = genid_uint31 "nix";
-          openssh.authorizedKeys.keys = [
-            config.krebs.hosts.mors.ssh.pubkey
           ];
         };
       };
-      nix.trustedUsers = ["nix"];
     }
     {
       environment.variables = {
@@ -70,7 +61,7 @@ with import <stockholm/lib>;
     {
       #for sshuttle
       environment.systemPackages = [
-        pkgs.pythonPackages.python
+        pkgs.python3Packages.python
       ];
     }
   ];
@@ -89,8 +80,6 @@ with import <stockholm/lib>;
 
   services.timesyncd.enable = mkForce true;
 
-  boot.tmpOnTmpfs = true;
-
   # multiple-definition-problem when defining environment.variables.EDITOR
   environment.extraInit = ''
     EDITOR=vim
@@ -102,6 +91,7 @@ with import <stockholm/lib>;
   #stockholm
     deploy
     git
+    git-preview
     gnumake
     jq
 
@@ -126,6 +116,7 @@ with import <stockholm/lib>;
     file
     hashPassword
     kpaste
+    cyberlocker-tools
     pciutils
     pop
     q
@@ -187,6 +178,7 @@ with import <stockholm/lib>;
   services.journald.extraConfig = ''
     SystemMaxUse=1G
     RuntimeMaxUse=128M
+    Storage=persistent
   '';
 
   krebs.iptables = {
@@ -223,7 +215,11 @@ with import <stockholm/lib>;
     noipv4ll
   '';
 
+  documentation.nixos.includeAllModules = true;
+
   # use 24:00 time format, the default got sneakily changed around 20.03
   i18n.defaultLocale = mkDefault "C.UTF-8";
+  time.timeZone = mkDefault"Europe/Berlin";
+
   system.stateVersion = mkDefault "20.03";
 }
diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix
index b677fe455..cb9abd43a 100644
--- a/lass/2configs/exim-smarthost.nix
+++ b/lass/2configs/exim-smarthost.nix
@@ -19,8 +19,10 @@ in {
       "lassul.us"
     ];
     relay_from_hosts = map (host: host.nets.retiolum.ip6.addr) [
-      config.krebs.hosts.mors
       config.krebs.hosts.blue
+      config.krebs.hosts.coaxmetal
+      config.krebs.hosts.green
+      config.krebs.hosts.mors
       config.krebs.hosts.xerxes
     ];
     internet-aliases = map (from: { inherit from to; }) mails;
diff --git a/lass/2configs/fetchWallpaper.nix b/lass/2configs/fetchWallpaper.nix
index 251f886a9..381df494d 100644
--- a/lass/2configs/fetchWallpaper.nix
+++ b/lass/2configs/fetchWallpaper.nix
@@ -5,7 +5,7 @@ let
 in {
   krebs.fetchWallpaper = {
     enable = true;
-    url = "prism/realwallpaper-krebs-stars.png";
+    url = "prism/realwallpaper-krebs-stars-berlin.png";
   };
 }
 
diff --git a/lass/2configs/gc.nix b/lass/2configs/gc.nix
index f9c61c461..224a6cbb9 100644
--- a/lass/2configs/gc.nix
+++ b/lass/2configs/gc.nix
@@ -3,7 +3,7 @@
 with import <stockholm/lib>;
 {
   nix.gc = {
-    automatic = ! (elem config.krebs.build.host.name [ "mors" "xerxes" ] || config.boot.isContainer);
+    automatic = ! (elem config.krebs.build.host.name [ "mors" "xerxes" "coaxmetal" ] || config.boot.isContainer);
     options = "--delete-older-than 15d";
   };
 }
diff --git a/lass/2configs/git-brain.nix b/lass/2configs/git-brain.nix
new file mode 100644
index 000000000..1c6f92fcd
--- /dev/null
+++ b/lass/2configs/git-brain.nix
@@ -0,0 +1,57 @@
+{ config, lib, pkgs, ... }:
+with import <stockholm/lib>;
+let
+
+  repos = krebs-repos;
+  rules = concatMap krebs-rules (attrValues krebs-repos);
+
+  krebs-repos = mapAttrs make-krebs-repo {
+    brain = { };
+    krebs-secrets = { };
+  };
+
+
+  make-krebs-repo = with git; name: { cgit ? {}, ... }: {
+    inherit cgit name;
+    public = false;
+    hooks = {
+      post-receive = pkgs.git-hooks.irc-announce {
+        nick = config.networking.hostName;
+        verbose = true;
+        channel = "#xxx";
+        # TODO remove the hardcoded hostname
+        server = "irc.r";
+      };
+    };
+  };
+
+
+
+  # TODO: get the list of all krebsministers
+  krebsminister = with config.krebs.users; [ makefu tv ];
+  krebs-rules = repo:
+    set-owners repo [ config.krebs.users.lass ] ++ set-ro-access repo krebsminister;
+
+  set-ro-access = with git; repo: user:
+      singleton {
+        inherit user;
+        repo = [ repo ];
+        perm = fetch;
+      };
+
+  set-owners = with git;repo: user:
+      singleton {
+        inherit user;
+        repo = [ repo ];
+        perm = push "refs/*" [ non-fast-forward create delete merge ];
+      };
+
+in {
+  krebs.git = {
+    enable = true;
+    cgit = {
+      enable = false;
+    };
+    inherit repos rules;
+  };
+}
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index e6aeca5d1..e6c77f64b 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -189,7 +189,7 @@ let
     with git // config.krebs.users;
     repo:
       singleton {
-        user = [ lass lass-mors lass-blue lass-yubikey ];
+        user = [ lass lass-green ];
         repo = [ repo ];
         perm = push "refs/*" [ non-fast-forward create delete merge ];
       } ++
diff --git a/lass/2configs/green-host.nix b/lass/2configs/green-host.nix
index 355daba9c..a83ed0544 100644
--- a/lass/2configs/green-host.nix
+++ b/lass/2configs/green-host.nix
@@ -6,12 +6,12 @@
   ];
   krebs.sync-containers.containers.green = {
     peers = [
+      "echelon"
       "icarus"
+      "littleT"
+      "mors"
       "shodan"
       "skynet"
-      "mors"
-      "morpheus"
-      "littleT"
       "styx"
     ];
     hostIp = "10.233.2.15";
@@ -25,5 +25,9 @@
     repo = "/var/lib/sync-containers/green/backup";
     compression = "auto,lzma";
     startAt = "daily";
+    prune.keep = {
+      daily = 7;
+      weekly = 4;
+    };
   };
 }
diff --git a/lass/2configs/hw/x220.nix b/lass/2configs/hw/x220.nix
index 31f9787e0..cbb5b168d 100644
--- a/lass/2configs/hw/x220.nix
+++ b/lass/2configs/hw/x220.nix
@@ -6,7 +6,6 @@
 
   boot = {
     initrd.luks.devices.luksroot.device = "/dev/sda3";
-    initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
     initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
     extraModulePackages = [
       config.boot.kernelPackages.tp_smapi
@@ -36,11 +35,6 @@
       fsType = "btrfs";
       options = ["defaults" "noatime" "ssd" "compress=lzo"];
     };
-    "/tmp" = {
-      device = "tmpfs";
-      fsType = "tmpfs";
-      options = ["nosuid" "nodev" "noatime"];
-    };
   };
 
   services.logind.lidSwitch = "ignore";
diff --git a/lass/2configs/mpv.nix b/lass/2configs/mpv.nix
index 210551a62..854af3eb5 100644
--- a/lass/2configs/mpv.nix
+++ b/lass/2configs/mpv.nix
@@ -80,7 +80,12 @@ let
     name = "mpv";
     paths = [
       (pkgs.writeDashBin "mpv" ''
-        exec ${pkgs.mpv}/bin/mpv -vo=gpu --no-config --script=${autosub} "$@"
+        exec ${pkgs.mpv}/bin/mpv \
+         -vo=gpu \
+         --no-config \
+         --script=${autosub} \
+         --script-opts=ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp \
+         "$@"
       '')
       pkgs.mpv
     ];
diff --git a/lass/2configs/muchsync.nix b/lass/2configs/muchsync.nix
index b09bf579b..392970dbd 100644
--- a/lass/2configs/muchsync.nix
+++ b/lass/2configs/muchsync.nix
@@ -4,6 +4,7 @@ with (import <stockholm/lib>);
 {
   systemd.services.muchsync = let
     hosts = [
+      "coaxmetal.r"
       "mors.r"
       "green.r"
       "blue.r"
diff --git a/lass/2configs/murmur.nix b/lass/2configs/murmur.nix
index 9f325d0af..7cc4051a8 100644
--- a/lass/2configs/murmur.nix
+++ b/lass/2configs/murmur.nix
@@ -16,7 +16,7 @@
     StandardError = lib.mkForce "journal";
   };
   virtualisation.oci-containers.containers.mumble-web = {
-    image = "rankenstein/mumble-web";
+    image = "rankenstein/mumble-web:0.5";
     environment = {
       MUMBLE_SERVER = "lassul.us:64738";
     };
@@ -28,12 +28,9 @@
   services.nginx.virtualHosts."mumble.lassul.us" = {
     enableACME = true;
     forceSSL = true;
-    locations."/".extraConfig = ''
-      proxy_pass http://localhost:64739/;
-      proxy_set_header Accept-Encoding "";
-      proxy_http_version 1.1;
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection $connection_upgrade;
-    '';
+    locations."/" = {
+      proxyPass = "http://localhost:64739";
+      proxyWebsockets = true;
+    };
   };
 }
diff --git a/lass/2configs/pass.nix b/lass/2configs/pass.nix
index 48070ea06..8ec3ac092 100644
--- a/lass/2configs/pass.nix
+++ b/lass/2configs/pass.nix
@@ -4,7 +4,15 @@
   users.users.mainUser.packages = with pkgs; [
     (pass.withExtensions (ext: [ ext.pass-otp ]))
     gnupg
+    (pkgs.writers.writeDashBin "unlock" ''
+      set -efu
+      HOST=$1
+
+      pw=$(pass show "admin/$HOST/luks")
+      torify sshn root@$(pass "hosts/$HOST/initrd/hostname") "echo $pw > /crypt-ramfs/passphrase"
+    '')
   ];
 
   programs.gnupg.agent.enable = true;
+
 }
diff --git a/lass/2configs/pipewire.nix b/lass/2configs/pipewire.nix
index 8fdcff4e3..c21ab5d9c 100644
--- a/lass/2configs/pipewire.nix
+++ b/lass/2configs/pipewire.nix
@@ -16,6 +16,7 @@
   environment.systemPackages = with pkgs; [
     alsaUtils
     pulseaudioLight
+    ponymix
   ];
 
   environment.variables.PULSE_SERVER = "localhost:4713";
@@ -26,6 +27,7 @@
     alsa.support32Bit = true;
     pulse.enable = true;
     jack.enable = true;
+
     # https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Migrate-PulseAudio#module-native-protocol-tcp
     config.pipewire-pulse = {
       "context.properties" = {
diff --git a/lass/2configs/prism-mounts/samba.nix b/lass/2configs/prism-mounts/samba.nix
new file mode 100644
index 000000000..4b1475ef3
--- /dev/null
+++ b/lass/2configs/prism-mounts/samba.nix
@@ -0,0 +1,15 @@
+{
+  fileSystems."/mnt/prism" = {
+    device = "//prism.r/public";
+    fsType = "cifs";
+    options = [
+      "guest"
+      "nofail"
+      "noauto"
+      "ro"
+      "x-systemd.automount"
+      "x-systemd.device-timeout=1"
+      "x-systemd.idle-timeout=1min"
+    ];
+  };
+ }
diff --git a/lass/2configs/programs.nix b/lass/2configs/programs.nix
index 241d263f8..0a4b4fd9b 100644
--- a/lass/2configs/programs.nix
+++ b/lass/2configs/programs.nix
@@ -13,9 +13,23 @@
     pv
     pwgen
     remmina
+    ripgrep
     silver-searcher
+    transmission
     wget
     xsel
     youtube-dl
+    (pkgs.writeDashBin "tether-on" ''
+      adb shell svc usb setFunctions rndis
+    '')
+    (pkgs.writeDashBin "tether-off" ''
+      adb shell svc usb setFunctions
+    '')
+    (pkgs.writeDashBin "dl-movie" ''
+      ${pkgs.transmission}/bin/transmission-remote yellow.r -w /var/download/finished/sorted/movies -a "$@"
+    '')
+    (pkgs.writeDashBin "dl-series" ''
+      ${pkgs.transmission}/bin/transmission-remote yellow.r -w /var/download/finished/sorted/series -a "$@"
+    '')
   ];
 }
diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index b1e1ed4d9..501251d13 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -356,6 +356,89 @@ in {
       locations."= /good".extraConfig = ''
         proxy_pass http://localhost:8001;
       '';
+      locations."= /controls".extraConfig = ''
+        default_type "text/html";
+        alias ${pkgs.writeText "controls.html" ''
+<!doctype html>
+
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+  <title>The_Playlist Voting!</title>
+<style>
+#good {
+    display: block;
+  width: 100%;
+  border: none;
+  background-color: #04AA6D;
+  padding: 14px;
+  margin: 14px 0 0 0;
+  height: 100px;
+  font-size: 16px;
+  cursor: pointer;
+  text-align: center;
+}
+#bad {
+    display: block;
+  width: 100%;
+  border: none;
+  background-color: red;
+  padding: 14px;
+    height: 100px;
+
+  margin: 14px 0 0 0;
+  font-size: 16px;
+  cursor: pointer;
+  text-align: center;
+}
+</style>
+
+</head>
+
+<body>
+  <div id=votenote></div>
+  <button id=good type="button"> GUT </button>
+
+  <button id=bad type="button"> SCHLECHT </button>
+  <center>
+    Currently Running: <br/><div>
+      <b id=current></b>
+    </div>
+    <div id=vote>
+    </div>
+    <audio controls autoplay="autoplay">
+      <source src="https://radio.lassul.us/radio.ogg" type="audio/ogg">
+      Your browser does not support the audio element.
+    </audio>
+  </center>
+
+  <script>
+    document.getElementById("good").onclick=async ()=>{
+      let result = await fetch("https://radio.lassul.us/good", {"method": "POST"})
+      document.getElementById("vote").textContent =  "Dieses Lied findest du gut"
+    };
+    document.getElementById("bad").onclick=async ()=>{
+      let result = await fetch("https://radio.lassul.us/skip", {"method": "POST"})
+      document.getElementById("vote").textContent =  "Dieses Lied findest du schlecht"
+    };
+
+    async function current() {
+      let result = await fetch("https://radio.lassul.us/current", {"method": "GET"})
+      let data = await result.json()
+      document.getElementById("current").textContent = data.name
+    }
+    window.onload = function() {
+      window.setInterval('current()', 10000)
+      current()
+    }
+
+  </script>
+</body>
+</html>
+      ''};
+      '';
       extraConfig = ''
         add_header 'Access-Control-Allow-Origin' '*';
         add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
@@ -371,7 +454,7 @@ in {
           </head>
           <body>
             <div style="display:inline-block;margin:0px;padding:0px;overflow:hidden">
-              <iframe src="https://kiwiirc.com/client/irc.freenode.org/?nick=kiwi_test|?&theme=cli#the_playlist" frameborder="0" style="overflow:hidden;overflow-x:hidden;overflow-y:hidden;height:95%;width:100%;position:absolute;top:0px;left:0px;right:0px;bottom:0px" height="95%" width="100%"></iframe>
+              <iframe src="https://kiwiirc.com/client/irc.hackint.org/?nick=kiwi_test|?&theme=cli#the_playlist" frameborder="0" style="overflow:hidden;overflow-x:hidden;overflow-y:hidden;height:95%;width:100%;position:absolute;top:0px;left:0px;right:0px;bottom:0px" height="95%" width="100%"></iframe>
             </div>
             <div style="position:absolute;bottom:1px;display:inline-block;background-color:red;">
               <audio controls autoplay="autoplay"><source src="http://lassul.us:8000/radio.ogg" type="audio/ogg">Your browser does not support the audio element.</audio>
diff --git a/lass/2configs/reaktor-coders.nix b/lass/2configs/reaktor-coders.nix
index 7fd6a2a29..457d5b6c7 100644
--- a/lass/2configs/reaktor-coders.nix
+++ b/lass/2configs/reaktor-coders.nix
@@ -29,43 +29,6 @@ in {
             hooks.url-title
             {
               activate = "match";
-              pattern = ''^@([^ ]+) (.*)$'';
-              command = 1;
-              arguments = [2];
-              env.HOME = config.krebs.reaktor2.coders.stateDir;
-              commands = let
-                lambdabot = (import (pkgs.fetchFromGitHub {
-                  owner = "NixOS"; repo = "nixpkgs";
-                  rev = "a4ec1841da14fc98c5c35cc72242c23bb698d4ac";
-                  sha256 = "148fpw31s922hxrf28yhrci296f7c7zd81hf0k6zs05rq0i3szgy";
-                }) {}).lambdabot;
-                lambdabotWrapper = pkgs.writeDash "lambdabot.wrapper" ''
-                  exec ${lambdabot}/bin/lambdabot \
-                    -XStandaloneDeriving -XGADTs -XFlexibleContexts \
-                    -XFlexibleInstances -XMultiParamTypeClasses \
-                    -XOverloadedStrings -XFunctionalDependencies \
-                    -e "$@"
-                '';
-              in {
-                pl.filename = pkgs.writeDash "lambdabot-pl" ''
-                  ${lambdabotWrapper} "@pl $1"
-                '';
-                type.filename = pkgs.writeDash "lambdabot-type" ''
-                  ${lambdabotWrapper} "@type $1"
-                '';
-                "let".filename = pkgs.writeDash "lambdabot-let" ''
-                  ${lambdabotWrapper} "@let $1"
-                '';
-                run.filename = pkgs.writeDash "lambdabot-run" ''
-                  ${lambdabotWrapper} "@run $1"
-                '';
-                kind.filename = pkgs.writeDash "lambdabot-kind" ''
-                  ${lambdabotWrapper} "@kind $1"
-                '';
-              };
-            }
-            {
-              activate = "match";
               pattern = ''^!([^ ]+)(?:\s*(.*))?'';
               command = 1;
               arguments = [2];
diff --git a/lass/2configs/steam.nix b/lass/2configs/steam.nix
index 2b9811959..d814a2499 100644
--- a/lass/2configs/steam.nix
+++ b/lass/2configs/steam.nix
@@ -13,7 +13,7 @@
   nixpkgs.config.steam.java = true;
   hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
 
-  users.users.games.packages