diff options
| author | lassulus <lass@aidsballs.de> | 2015-10-07 00:07:06 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-10-07 00:07:06 +0200 |
| commit | 9d2d034542da532a2242d8e407ba0da8fad2fb9a (patch) | |
| tree | fb6a084a5984d628b5fe6ccb442540dfc873aebb /makefu | |
| parent | eabf194460f695044d32713900419583986a9bd5 (diff) | |
| parent | 973e7adab745c7493c592e6bc0e3f8367b32dfbc (diff) | |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/pnp.nix | 1 | ||||
| -rw-r--r-- | makefu/2configs/Reaktor/random-emoji.nix | 25 | ||||
| -rw-r--r-- | makefu/2configs/Reaktor/random-emoji.sh | 5 | ||||
| -rw-r--r-- | makefu/2configs/git/cgit-retiolum.nix | 1 |
4 files changed, 32 insertions, 0 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 7698ea14d..fdc2f0135 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -23,6 +23,7 @@ ## \/ are only plugins, must enable Reaktor explicitly ../2configs/Reaktor/stockholmLentil.nix ../2configs/Reaktor/simpleExtend.nix + ../2configs/Reaktor/random-emoji.nix ../2configs/Reaktor/titlebot.nix ../2configs/exim-retiolum.nix diff --git a/makefu/2configs/Reaktor/random-emoji.nix b/makefu/2configs/Reaktor/random-emoji.nix new file mode 100644 index 000000000..b2d99b36b --- /dev/null +++ b/makefu/2configs/Reaktor/random-emoji.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with pkgs; +let + rpkg = pkgs.substituteAll( { + name="random-emoji"; + dir= "bin"; + isExecutable=true; + src= ./random-emoji.sh; + }); + rpkg-path = lib.makeSearchPath "bin" (with pkgs; [ + coreutils + gnused + gnugrep + curl]); +in { + # TODO: make origin a variable, <- module is generic enough to handle different origins, not only stockholm + krebs.Reaktor.extraConfig = '' + public_commands.insert(0,{ + 'capname' : "emoji", + 'pattern' : indirect_pattern.format("emoji"), + 'argv' : ["${rpkg}/bin/random-emoji"], + 'env' : { 'PATH':'${rpkg-path}' } }) + ''; +} diff --git a/makefu/2configs/Reaktor/random-emoji.sh b/makefu/2configs/Reaktor/random-emoji.sh new file mode 100644 index 000000000..913d615be --- /dev/null +++ b/makefu/2configs/Reaktor/random-emoji.sh @@ -0,0 +1,5 @@ +#!/bin/sh +curl http://emojicons.com/random -s | \ + grep data-text | \ + sed -n 's/.*>\(.*\)<\/textarea>/\1/p' | \ + head -n 1 diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix index 40b51e601..1277a014e 100644 --- a/makefu/2configs/git/cgit-retiolum.nix +++ b/makefu/2configs/git/cgit-retiolum.nix @@ -29,6 +29,7 @@ let hooks = { post-receive = git.irc-announce { nick = config.networking.hostName; + verbose = config.krebs.build.host.name == "pnp"; channel = "#retiolum"; # TODO remove the hardcoded hostname server = "cd.retiolum"; |