Merge remote-tracking branch 'lass/master'
This commit is contained in:
commit
7bc36518d1
|
@ -12,8 +12,8 @@
|
||||||
<stockholm/krebs/2configs/buildbot-stockholm.nix>
|
<stockholm/krebs/2configs/buildbot-stockholm.nix>
|
||||||
<stockholm/krebs/2configs/binary-cache/nixos.nix>
|
<stockholm/krebs/2configs/binary-cache/nixos.nix>
|
||||||
<stockholm/krebs/2configs/ircd.nix>
|
<stockholm/krebs/2configs/ircd.nix>
|
||||||
<stockholm/krebs/2configs/reaktor-retiolum.nix>
|
<stockholm/krebs/2configs/nscd-fix.nix>
|
||||||
<stockholm/krebs/2configs/reaktor-krebs.nix>
|
<stockholm/krebs/2configs/reaktor2.nix>
|
||||||
<stockholm/krebs/2configs/repo-sync.nix>
|
<stockholm/krebs/2configs/repo-sync.nix>
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
24
krebs/2configs/nscd-fix.nix
Normal file
24
krebs/2configs/nscd-fix.nix
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
with import <stockholm/lib>;
|
||||||
|
{ pkgs, ... }: let
|
||||||
|
|
||||||
|
enable = versionOlderThan "19.03";
|
||||||
|
|
||||||
|
versionOlderThan = v:
|
||||||
|
compareVersions
|
||||||
|
(versions.majorMinor version)
|
||||||
|
(versions.majorMinor v)
|
||||||
|
== -1;
|
||||||
|
|
||||||
|
warning = ''
|
||||||
|
Using custom services.nscd.config because
|
||||||
|
https://github.com/NixOS/nixpkgs/pull/50316
|
||||||
|
'';
|
||||||
|
|
||||||
|
in
|
||||||
|
optionalAttrs enable (trace warning {
|
||||||
|
services.nscd.enable = mkForce true;
|
||||||
|
services.nscd.config = mkForce (readFile (pkgs.fetchurl {
|
||||||
|
url = https://raw.githubusercontent.com/arianvp/nixpkgs/1d5f4cb/nixos/modules/services/system/nscd.conf;
|
||||||
|
sha256 = "1jlddk38lyynjn51zx3xi1nc29ahajyh0qg48qbq6dqlsrn3wxqs";
|
||||||
|
}));
|
||||||
|
})
|
|
@ -1,26 +0,0 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
with import <stockholm/lib>;
|
|
||||||
|
|
||||||
{
|
|
||||||
krebs.Reaktor.krebs = {
|
|
||||||
nickname = "Reaktor|krebs";
|
|
||||||
channels = [
|
|
||||||
"#krebs"
|
|
||||||
"#nixos-wiki"
|
|
||||||
];
|
|
||||||
extraEnviron = {
|
|
||||||
REAKTOR_HOST = "irc.freenode.org";
|
|
||||||
REAKTOR_NICKSERV_PASSWORD = "/var/lib/Reaktor/reaktor_nickserv_password";
|
|
||||||
};
|
|
||||||
plugins = with pkgs.ReaktorPlugins; [
|
|
||||||
sed-plugin
|
|
||||||
] ++
|
|
||||||
(attrValues (task "agenda"))
|
|
||||||
;
|
|
||||||
};
|
|
||||||
krebs.secret.files.nix-serve-key = {
|
|
||||||
path = "/var/lib/Reaktor/reaktor_nickserv_password";
|
|
||||||
owner.name = "Reaktor";
|
|
||||||
source-path = toString <secrets> + "/reaktor_nickserv_password";
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,17 +0,0 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
with import <stockholm/lib>;
|
|
||||||
|
|
||||||
{
|
|
||||||
krebs.Reaktor.retiolum = {
|
|
||||||
nickname = "Reaktor|lass";
|
|
||||||
channels = [ "#noise" "#xxx" ];
|
|
||||||
extraEnviron = {
|
|
||||||
REAKTOR_HOST = "irc.r";
|
|
||||||
};
|
|
||||||
plugins = with pkgs.ReaktorPlugins; [
|
|
||||||
sed-plugin
|
|
||||||
] ++
|
|
||||||
(attrValues (task "agenda"))
|
|
||||||
;
|
|
||||||
};
|
|
||||||
}
|
|
152
krebs/2configs/reaktor2.nix
Normal file
152
krebs/2configs/reaktor2.nix
Normal file
|
@ -0,0 +1,152 @@
|
||||||
|
with import <stockholm/lib>;
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
#for shared state directory
|
||||||
|
stateDir = config.krebs.reaktor2.r.stateDir;
|
||||||
|
|
||||||
|
generators = pkgs.reaktor2-plugins.generators;
|
||||||
|
hooks = pkgs.reaktor2-plugins.hooks;
|
||||||
|
commands = pkgs.reaktor2-plugins.commands;
|
||||||
|
|
||||||
|
task = name: let
|
||||||
|
rcFile = builtins.toFile "taskrc" ''
|
||||||
|
confirmation=no
|
||||||
|
'';
|
||||||
|
in {
|
||||||
|
pattern = "^${name}-([a-z]+)(?::\\s*(.*))?";
|
||||||
|
activate = "match";
|
||||||
|
command = 1;
|
||||||
|
arguments = [2];
|
||||||
|
env.TASKDATA = "${stateDir}/${name}";
|
||||||
|
commands = {
|
||||||
|
add.filename = pkgs.writeDash "${name}-task-add" ''
|
||||||
|
${pkgs.taskwarrior}/bin/task rc:${rcFile} add "$1"
|
||||||
|
'';
|
||||||
|
list.filename = pkgs.writeDash "${name}-task-list" ''
|
||||||
|
${pkgs.taskwarrior}/bin/task rc:${rcFile} export \
|
||||||
|
| ${pkgs.jq}/bin/jq -r '
|
||||||
|
.[] | select(.id != 0) | "\(.id) \(.description)"
|
||||||
|
'
|
||||||
|
'';
|
||||||
|
delete.filename = pkgs.writeDash "${name}-task-delete" ''
|
||||||
|
${pkgs.taskwarrior}/bin/task rc:${rcFile} delete "$1"
|
||||||
|
'';
|
||||||
|
done.filename = pkgs.writeDash "${name}-task-done" ''
|
||||||
|
${pkgs.taskwarrior}/bin/task rc:${rcFile} done "$1"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
systemPlugin = {
|
||||||
|
plugin = "system";
|
||||||
|
config = {
|
||||||
|
workdir = stateDir;
|
||||||
|
hooks.JOIN = [
|
||||||
|
{
|
||||||
|
activate = "always";
|
||||||
|
command = {
|
||||||
|
filename =
|
||||||
|
"${pkgs.Reaktor.src}/reaktor/commands/tell-on_join";
|
||||||
|
env = {
|
||||||
|
PATH = makeBinPath [
|
||||||
|
pkgs.coreutils # XXX env, touch
|
||||||
|
pkgs.jq # XXX sed
|
||||||
|
pkgs.utillinux # XXX flock
|
||||||
|
];
|
||||||
|
state_file = "${stateDir}/tell.json";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
hooks.PRIVMSG = [
|
||||||
|
{
|
||||||
|
pattern = "^bier bal(ance)*$";
|
||||||
|
activate = "match";
|
||||||
|
command = {
|
||||||
|
env = {
|
||||||
|
state_file = "${stateDir}/ledger";
|
||||||
|
};
|
||||||
|
filename = pkgs.writeDash "bier-balance" ''
|
||||||
|
${pkgs.hledger}/bin/hledger -f $state_file bal -N -O csv \
|
||||||
|
| ${pkgs.coreutils}/bin/tail +2 \
|
||||||
|
| ${pkgs.miller}/bin/mlr --icsv --opprint cat
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
pattern = ''^(\S+)\s+([+-][1-9][0-9]*)\s+(\S+)$'';
|
||||||
|
activate = "match";
|
||||||
|
arguments = [1 2 3];
|
||||||
|
command = {
|
||||||
|
env = {
|
||||||
|
# TODO; get state as argument
|
||||||
|
state_file = "${stateDir}/ledger";
|
||||||
|
};
|
||||||
|
filename = pkgs.writeDash "ledger-add" ''
|
||||||
|
set -x
|
||||||
|
tonick=$1
|
||||||
|
amt=$2
|
||||||
|
unit=$3
|
||||||
|
printf '%s\n %s %d %s\n %s %d %s\n' "$(date -Id)" "$tonick" "$amt" "$unit" "$_from" "$(expr 0 - "''${amt#+}")" "$unit" >> $state_file
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
|
hooks.sed
|
||||||
|
(generators.command_hook {
|
||||||
|
inherit (commands) hello random-emoji nixos-version stockholm-issue;
|
||||||
|
tell = {
|
||||||
|
filename =
|
||||||
|
"${pkgs.Reaktor.src}/reaktor/commands/tell-on_privmsg";
|
||||||
|
env = {
|
||||||
|
PATH = makeBinPath [
|
||||||
|
pkgs.coreutils # XXX date, env
|
||||||
|
pkgs.jq # XXX sed
|
||||||
|
pkgs.utillinux # XXX flock
|
||||||
|
];
|
||||||
|
state_file = "${stateDir}/tell.txt";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
(task "agenda")
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
in {
|
||||||
|
|
||||||
|
krebs.reaktor2 = {
|
||||||
|
freenode = {
|
||||||
|
hostname = "irc.freenode.org";
|
||||||
|
nick = "reaktor2|krebs";
|
||||||
|
plugins = [
|
||||||
|
{
|
||||||
|
plugin = "register";
|
||||||
|
config = {
|
||||||
|
channels = [
|
||||||
|
"#krebs"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
systemPlugin
|
||||||
|
];
|
||||||
|
username = "reaktor2";
|
||||||
|
};
|
||||||
|
r = {
|
||||||
|
nick = "reaktor2|krebs";
|
||||||
|
plugins = [
|
||||||
|
{
|
||||||
|
plugin = "register";
|
||||||
|
config = {
|
||||||
|
channels = [
|
||||||
|
"#noise"
|
||||||
|
"#xxx"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
systemPlugin
|
||||||
|
];
|
||||||
|
username = "reaktor2";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -113,10 +113,11 @@ let
|
||||||
'';
|
'';
|
||||||
in nameValuePair "Reaktor-${name}" {
|
in nameValuePair "Reaktor-${name}" {
|
||||||
path = with pkgs; [
|
path = with pkgs; [
|
||||||
utillinux #flock for tell_on-join
|
|
||||||
git # for nag
|
git # for nag
|
||||||
|
jq # for tell
|
||||||
python # for caps
|
python # for caps
|
||||||
];
|
utillinux # flock for tell
|
||||||
|
];
|
||||||
description = "Reaktor IRC Bot";
|
description = "Reaktor IRC Bot";
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
|
@ -42,6 +42,7 @@ let
|
||||||
./per-user.nix
|
./per-user.nix
|
||||||
./power-action.nix
|
./power-action.nix
|
||||||
./Reaktor.nix
|
./Reaktor.nix
|
||||||
|
./reaktor2.nix
|
||||||
./realwallpaper.nix
|
./realwallpaper.nix
|
||||||
./retiolum-bootstrap.nix
|
./retiolum-bootstrap.nix
|
||||||
./retiolum-hosts.nix
|
./retiolum-hosts.nix
|
||||||
|
|
|
@ -25,7 +25,7 @@ with import <stockholm/lib>;
|
||||||
type = types.listOf types.attrs;
|
type = types.listOf types.attrs;
|
||||||
};
|
};
|
||||||
stateDir = mkOption {
|
stateDir = mkOption {
|
||||||
default = "/var/lib/${self.config.systemd-service-name}";
|
default = "/var/lib/${self.config.username}";
|
||||||
readOnly = true;
|
readOnly = true;
|
||||||
type = types.absolute-pathname;
|
type = types.absolute-pathname;
|
||||||
};
|
};
|
||||||
|
@ -33,6 +33,14 @@ with import <stockholm/lib>;
|
||||||
default = "reaktor2${optionalString (name != "default") "-${name}"}";
|
default = "reaktor2${optionalString (name != "default") "-${name}"}";
|
||||||
type = types.filename;
|
type = types.filename;
|
||||||
};
|
};
|
||||||
|
username = mkOption {
|
||||||
|
default = self.config.systemd-service-name;
|
||||||
|
type = types.username;
|
||||||
|
};
|
||||||
|
useTLS = mkOption {
|
||||||
|
default = self.config.port == "6697";
|
||||||
|
type = types.bool;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
@ -43,10 +51,10 @@ with import <stockholm/lib>;
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
User = cfg.systemd-service-name;
|
User = cfg.username;
|
||||||
Group = "reaktor2";
|
Group = "reaktor2";
|
||||||
DynamicUser = true;
|
DynamicUser = true;
|
||||||
StateDirectory = cfg.systemd-service-name;
|
StateDirectory = cfg.username;
|
||||||
ExecStart = let
|
ExecStart = let
|
||||||
configFile = pkgs.writeJSON configFileName configValue;
|
configFile = pkgs.writeJSON configFileName configValue;
|
||||||
configFileName = "${cfg.systemd-service-name}.config.json";
|
configFileName = "${cfg.systemd-service-name}.config.json";
|
||||||
|
|
|
@ -7,8 +7,8 @@ with import <stockholm/lib>;
|
||||||
sha256 = "1k908zap3694fcxdk4bb29s54b0lhdh557y10ybjskfwnym7szn1";
|
sha256 = "1k908zap3694fcxdk4bb29s54b0lhdh557y10ybjskfwnym7szn1";
|
||||||
};
|
};
|
||||||
"18.09" = {
|
"18.09" = {
|
||||||
version = "1.3.0";
|
version = "2.1.0";
|
||||||
sha256 = "1y9jhh9pchrr48zgfib2jip97x1fkm7qb1gnfx477rmmryjs500h";
|
sha256 = "0wc8v48bb0bkvypc0j6imvnf8xc8572hykk9sgjhzf2w0ggqxv5d";
|
||||||
};
|
};
|
||||||
}.${versions.majorMinor nixpkgsVersion};
|
}.${versions.majorMinor nixpkgsVersion};
|
||||||
|
|
||||||
|
|
|
@ -8,11 +8,12 @@
|
||||||
}:
|
}:
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
pname = "much";
|
pname = "much";
|
||||||
version = "1.1.0";
|
version = "1.2.0";
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "http://cgit.ni.krebsco.de/much";
|
url = "https://cgit.krebsco.de/much";
|
||||||
sha256 = "1325554zymr1dd0clj8c5ygl70c791csvs0hz33jcfr6b8wysdrl";
|
sha256 = "0gfvppi8acylz0q7xh8dkm3dj676d4sc1m1gxwp663bkn4748873";
|
||||||
rev = "dfec37d848e11c00d9b7f03295af1fc7b0e83ef5";
|
rev = "8fc4fbb5bb7781626da8f63cd8df8bb0f554cfe7";
|
||||||
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
isLibrary = false;
|
isLibrary = false;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
|
@ -1,23 +1,27 @@
|
||||||
{ mkDerivation, aeson, attoparsec, base, blessings, bytestring
|
{ mkDerivation, aeson, async, attoparsec, base, blessings
|
||||||
, containers, fetchgit, filepath, network, network-simple
|
, bytestring, containers, data-default, fetchgit, filepath
|
||||||
, network-simple-tls, pcre-heavy, pcre-light, process, random
|
, hashable, lens, lens-aeson, network, network-simple
|
||||||
, stdenv, text, time, transformers, unix, unordered-containers
|
, network-simple-tls, pcre-light, process, random, stdenv
|
||||||
|
, string-conversions, stringsearch, text, time, transformers
|
||||||
|
, unagi-chan, unix, unordered-containers, vector
|
||||||
}:
|
}:
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
pname = "reaktor2";
|
pname = "reaktor2";
|
||||||
version = "0.0.0";
|
version = "0.2.1";
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://cgit.krebsco.de/reaktor2";
|
url = "https://cgit.krebsco.de/reaktor2";
|
||||||
sha256 = "1q2rb78mzpyd8wxfmlbfdz7zq5smsrrvb4n874ap1p8f2bmmp0am";
|
sha256 = "0wg76wlzfi893rl0lzhfs6bkpdcvwvgl6mpnz6w7r8f7znr4a9vr";
|
||||||
rev = "ce276eee82ec0b8c4106beb4c51d6f9eb77335c4";
|
rev = "0e199f7a357a4c5973e5837ec67699cf224ca69c";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
isLibrary = false;
|
isLibrary = false;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
executableHaskellDepends = [
|
executableHaskellDepends = [
|
||||||
aeson attoparsec base blessings bytestring containers filepath
|
aeson async attoparsec base blessings bytestring containers
|
||||||
network network-simple network-simple-tls pcre-heavy pcre-light
|
data-default filepath hashable lens lens-aeson network
|
||||||
process random text time transformers unix unordered-containers
|
network-simple network-simple-tls pcre-light process random
|
||||||
|
string-conversions stringsearch text time transformers unagi-chan
|
||||||
|
unix unordered-containers vector
|
||||||
];
|
];
|
||||||
license = stdenv.lib.licenses.mit;
|
license = stdenv.lib.licenses.mit;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
python3Packages.buildPythonPackage rec {
|
python3Packages.buildPythonPackage rec {
|
||||||
name = "Reaktor-${version}";
|
name = "Reaktor-${version}";
|
||||||
version = "0.6.2";
|
version = "0.7.0";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
@ -13,8 +13,8 @@ python3Packages.buildPythonPackage rec {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "krebs";
|
owner = "krebs";
|
||||||
repo = "Reaktor";
|
repo = "Reaktor";
|
||||||
rev = version;
|
rev = "v${version}";
|
||||||
sha256 = "0h8pj0x9b5fnxddwrc0f63rxd3275v5phmjc0fv4kiwlzvbcxj6m";
|
sha256 = "12yy06vk0smjs0rmahrn2kd4bcdh1yjw1fz6rifw6nmgx889d9hj";
|
||||||
};
|
};
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://krebsco.de/;
|
homepage = http://krebsco.de/;
|
||||||
|
|
2
krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
Normal file → Executable file
2
krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
Normal file → Executable file
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
curl http://emojicons.com/random -s | \
|
curl -sS http://emojicons.com/random | \
|
||||||
grep data-text | \
|
grep data-text | \
|
||||||
sed -n 's/.*>\(.*\)<\/textarea>/\1/p' | \
|
sed -n 's/.*>\(.*\)<\/textarea>/\1/p' | \
|
||||||
head -n 1 | \
|
head -n 1 | \
|
||||||
|
|
0
krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
Normal file → Executable file
0
krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
Normal file → Executable file
2
krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
Normal file → Executable file
2
krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
Normal file → Executable file
|
@ -46,7 +46,7 @@ if is_regex(line):
|
||||||
print('to many lines, skipped')
|
print('to many lines, skipped')
|
||||||
else:
|
else:
|
||||||
if last.strip() != ret.strip():
|
if last.strip() != ret.strip():
|
||||||
print("\x1b[1m{}\x1b[0m meant: {}".format(usr, ret.strip()))
|
print("\x02{}\x02 meant: {}".format(usr, ret.strip()))
|
||||||
if ret:
|
if ret:
|
||||||
d[usr] = ret
|
d[usr] = ret
|
||||||
|
|
||||||
|
|
0
krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
Normal file → Executable file
0
krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
Normal file → Executable file
|
@ -1,3 +0,0 @@
|
||||||
{ haskellPackages, ... }:
|
|
||||||
|
|
||||||
haskellPackages.callPackage ./cabal.nix {}
|
|
106
krebs/5pkgs/simple/reaktor2-plugins.nix
Normal file
106
krebs/5pkgs/simple/reaktor2-plugins.nix
Normal file
|
@ -0,0 +1,106 @@
|
||||||
|
with import <stockholm/lib>;
|
||||||
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
|
rec {
|
||||||
|
generators = {
|
||||||
|
command_hook = commands: {
|
||||||
|
pattern =
|
||||||
|
"^\\s*([0-9A-Za-z._][0-9A-Za-z._-]*)(?:\\s+(.*\\S))?\\s*$";
|
||||||
|
command = 1;
|
||||||
|
arguments = [2];
|
||||||
|
commands = commands;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
commands = {
|
||||||
|
|
||||||
|
hello = {
|
||||||
|
filename = "${pkgs.Reaktor.src}/reaktor/commands/hello";
|
||||||
|
};
|
||||||
|
|
||||||
|
random-emoji = {
|
||||||
|
filename = <stockholm/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh>;
|
||||||
|
env = {
|
||||||
|
PATH = makeBinPath (with pkgs; [ coreutils gnused gnugrep xmlstarlet wget ]);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
nixos-version = {
|
||||||
|
filename = pkgs.writeDash "nixos-version" ''
|
||||||
|
. /etc/os-release
|
||||||
|
echo "$PRETTY_NAME"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
stockholm-issue = {
|
||||||
|
filename = <stockholm/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh>;
|
||||||
|
env = {
|
||||||
|
PATH = makeBinPath (with pkgs; [ coreutils git gnused haskellPackages.lentil ]);
|
||||||
|
origin = "http://cgit.gum/stockholm";
|
||||||
|
state_dir = "/tmp/stockholm-issue";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
hooks = {
|
||||||
|
|
||||||
|
sed = {
|
||||||
|
activate = "always";
|
||||||
|
pattern = "^(.*)$";
|
||||||
|
arguments = [1];
|
||||||
|
command = {
|
||||||
|
env = {
|
||||||
|
PATH = makeBinPath (with pkgs; [ gnused ]);
|
||||||
|
state_dir = "/tmp";
|
||||||
|
};
|
||||||
|
filename = pkgs.writeDash "sed-plugin" ''
|
||||||
|
set -efu
|
||||||
|
exec ${pkgs.python3}/bin/python \
|
||||||
|
${<stockholm/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py>} "$@"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
shack-correct = {
|
||||||
|
activate = "match";
|
||||||
|
pattern = "^(.*Shack.*)$";
|
||||||
|
arguments = [1];
|
||||||
|
command.filename = <stockholm/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh>;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
url-title = {
|
||||||
|
#pattern = "^.*(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+).*$";
|
||||||
|
pattern = "^.*(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+).*$";
|
||||||
|
activate = "match";
|
||||||
|
arguments = [1];
|
||||||
|
command = {
|
||||||
|
filename = pkgs.writePython3 "url-title" { deps = with pkgs.python3Packages; [ beautifulsoup4 lxml ]; } ''
|
||||||
|
import cgi
|
||||||
|
import sys
|
||||||
|
import urllib.request
|
||||||
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
|
try:
|
||||||
|
req = urllib.request.Request(sys.argv[1])
|
||||||
|
req.add_header('user-agent', 'Reaktor-url-title')
|
||||||
|
resp = urllib.request.urlopen(req)
|
||||||
|
if resp.headers['content-type'].find('text/html') >= 0:
|
||||||
|
soup = BeautifulSoup(resp.read(16000), "lxml")
|
||||||
|
title = soup.find('title').string
|
||||||
|
|
||||||
|
if len(title.split('\n')) > 5:
|
||||||
|
title = '\n'.join(title.split('\n')[:5])
|
||||||
|
|
||||||
|
print(title[:450])
|
||||||
|
else:
|
||||||
|
cd_header = resp.headers['content-disposition']
|
||||||
|
print(cgi.parse_header(cd_header)[1]['filename'])
|
||||||
|
except: # noqa: E722
|
||||||
|
pass
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -36,10 +36,10 @@ with import <stockholm/lib>;
|
||||||
# TODO write function for proxy_pass (ssl/nonssl)
|
# TODO write function for proxy_pass (ssl/nonssl)
|
||||||
|
|
||||||
krebs.iptables.tables.filter.FORWARD.rules = [
|
krebs.iptables.tables.filter.FORWARD.rules = [
|
||||||
{ v6 = false; precedence = 1000; predicate = "-d 192.168.122.92"; target = "ACCEPT"; }
|
{ v6 = false; precedence = 1000; predicate = "-d 192.168.122.141"; target = "ACCEPT"; }
|
||||||
];
|
];
|
||||||
krebs.iptables.tables.nat.PREROUTING.rules = [
|
krebs.iptables.tables.nat.PREROUTING.rules = [
|
||||||
{ v6 = false; precedence = 1000; predicate = "-d 46.4.114.243"; target = "DNAT --to-destination 192.168.122.92"; }
|
{ v6 = false; precedence = 1000; predicate = "-d 95.216.1.130"; target = "DNAT --to-destination 192.168.122.141"; }
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
@ -379,6 +379,7 @@ with import <stockholm/lib>;
|
||||||
name = "download";
|
name = "download";
|
||||||
home = "/var/download";
|
home = "/var/download";
|
||||||
useDefaultShell = true;
|
useDefaultShell = true;
|
||||||
|
uid = genid "download";
|
||||||
openssh.authorizedKeys.keys = with config.krebs.users; [
|
openssh.authorizedKeys.keys = with config.krebs.users; [
|
||||||
lass.pubkey
|
lass.pubkey
|
||||||
lass-shodan.pubkey
|
lass-shodan.pubkey
|
||||||
|
@ -420,6 +421,16 @@ with import <stockholm/lib>;
|
||||||
{ predicate = "-i wiregrill -p udp --dport 4000:4002"; target = "ACCEPT"; }
|
{ predicate = "-i wiregrill -p udp --dport 4000:4002"; target = "ACCEPT"; }
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
nix.trustedUsers = [ "Mic92" ];
|
||||||
|
users.users.Mic92 = {
|
||||||
|
uid = genid_uint31 "Mic92";
|
||||||
|
isNormalUser = true;
|
||||||
|
openssh.authorizedKeys.keys = [
|
||||||
|
config.krebs.users.Mic92.pubkey
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
krebs.build.host = config.krebs.hosts.prism;
|
krebs.build.host = config.krebs.hosts.prism;
|
||||||
|
|
|
@ -63,9 +63,15 @@
|
||||||
defaultGateway = "95.216.1.129";
|
defaultGateway = "95.216.1.129";
|
||||||
# Use google's public DNS server
|
# Use google's public DNS server
|
||||||
nameservers = [ "8.8.8.8" ];
|
nameservers = [ "8.8.8.8" ];
|
||||||
interfaces.eth0 = {
|
interfaces.eth0.ipv4.addresses = [
|
||||||
ipAddress = "95.216.1.150";
|
{
|
||||||
prefixLength = 26;
|
address = "95.216.1.150";
|
||||||
};
|
prefixLength = 26;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
address = "95.216.1.130";
|
||||||
|
prefixLength = 26;
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,7 +88,7 @@ with import <stockholm/lib>;
|
||||||
client
|
client
|
||||||
dev tun
|
dev tun
|
||||||
proto udp
|
proto udp
|
||||||
remote 82.102.16.229 1194
|
remote 89.249.65.83 1194
|
||||||
resolv-retry infinite
|
resolv-retry infinite
|
||||||
remote-random
|
remote-random
|
||||||
nobind
|
nobind
|
||||||
|
@ -103,13 +103,9 @@ with import <stockholm/lib>;
|
||||||
reneg-sec 0
|
reneg-sec 0
|
||||||
comp-lzo no
|
comp-lzo no
|
||||||
|
|
||||||
explicit-exit-notify 3
|
|
||||||
|
|
||||||
remote-cert-tls server
|
remote-cert-tls server
|
||||||
|
|
||||||
#mute 10000
|
|
||||||
auth-user-pass ${toString <secrets/nordvpn.txt>}
|
auth-user-pass ${toString <secrets/nordvpn.txt>}
|
||||||
|
|
||||||
verb 3
|
verb 3
|
||||||
pull
|
pull
|
||||||
fast-io
|
fast-io
|
||||||
|
@ -118,32 +114,33 @@ with import <stockholm/lib>;
|
||||||
|
|
||||||
<ca>
|
<ca>
|
||||||
-----BEGIN CERTIFICATE-----
|
-----BEGIN CERTIFICATE-----
|
||||||
MIIEyjCCA7KgAwIBAgIJANIxRSmgmjW6MA0GCSqGSIb3DQEBCwUAMIGeMQswCQYD
|
MIIFCjCCAvKgAwIBAgIBATANBgkqhkiG9w0BAQ0FADA5MQswCQYDVQQGEwJQQTEQ
|
||||||
VQQGEwJQQTELMAkGA1UECBMCUEExDzANBgNVBAcTBlBhbmFtYTEQMA4GA1UEChMH
|
MA4GA1UEChMHTm9yZFZQTjEYMBYGA1UEAxMPTm9yZFZQTiBSb290IENBMB4XDTE2
|
||||||
Tm9yZFZQTjEQMA4GA1UECxMHTm9yZFZQTjEaMBgGA1UEAxMRZGUyMjkubm9yZHZw
|
MDEwMTAwMDAwMFoXDTM1MTIzMTIzNTk1OVowOTELMAkGA1UEBhMCUEExEDAOBgNV
|
||||||
bi5jb20xEDAOBgNVBCkTB05vcmRWUE4xHzAdBgkqhkiG9w0BCQEWEGNlcnRAbm9y
|
BAoTB05vcmRWUE4xGDAWBgNVBAMTD05vcmRWUE4gUm9vdCBDQTCCAiIwDQYJKoZI
|
||||||
ZHZwbi5jb20wHhcNMTcxMTIyMTQ1MTQ2WhcNMjcxMTIwMTQ1MTQ2WjCBnjELMAkG
|
hvcNAQEBBQADggIPADCCAgoCggIBAMkr/BYhyo0F2upsIMXwC6QvkZps3NN2/eQF
|
||||||
A1UEBhMCUEExCzAJBgNVBAgTAlBBMQ8wDQYDVQQHEwZQYW5hbWExEDAOBgNVBAoT
|
kfQIS1gql0aejsKsEnmY0Kaon8uZCTXPsRH1gQNgg5D2gixdd1mJUvV3dE3y9FJr
|
||||||
B05vcmRWUE4xEDAOBgNVBAsTB05vcmRWUE4xGjAYBgNVBAMTEWRlMjI5Lm5vcmR2
|
XMoDkXdCGBodvKJyU6lcfEVF6/UxHcbBguZK9UtRHS9eJYm3rpL/5huQMCppX7kU
|
||||||
cG4uY29tMRAwDgYDVQQpEwdOb3JkVlBOMR8wHQYJKoZIhvcNAQkBFhBjZXJ0QG5v
|
eQ8dpCwd3iKITqwd1ZudDqsWaU0vqzC2H55IyaZ/5/TnCk31Q1UP6BksbbuRcwOV
|
||||||
cmR2cG4uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv++dfZlG
|
skEDsm6YoWDnn/IIzGOYnFJRzQH5jTz3j1QBvRIuQuBuvUkfhx1FEwhwZigrcxXu
|
||||||
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
|
||||||
-----END CERTIFICATE-----
|
-----END CERTIFICATE-----
|
||||||
</ca>
|
</ca>
|
||||||
key-direction 1
|
key-direction 1
|
||||||
|
@ -152,23 +149,24 @@ with import <stockholm/lib>;
|
||||||
# 2048 bit OpenVPN static key
|
# 2048 bit OpenVPN static key
|
||||||
#
|
#
|
||||||
-----BEGIN OpenVPN Static key V1-----
|
-----BEGIN OpenVPN Static key V1-----
|
||||||
49b2f54c6ee58d2d97331681bb577d55
|
e685bdaf659a25a200e2b9e39e51ff03
|
||||||
054f56d92b743c31e80b684de0388702
|
0fc72cf1ce07232bd8b2be5e6c670143
|
||||||
ad3bf51088cd88f3fac7eb0729f2263c
|
f51e937e670eee09d4f2ea5a6e4e6996
|
||||||
51d82a6eb7e2ed4ae6dfa65b1ac764d0
|
5db852c275351b86fc4ca892d78ae002
|
||||||
b9dedf1379c1b29b36396d64cb6fd6b2
|
d6f70d029bd79c4d1c26cf14e9588033
|
||||||
e61f869f9a13001dadc02db171f04c4d
|
cf639f8a74809f29f72b9d58f9b8f5fe
|
||||||
c46d1132c1f31709e7b54a6eabae3ea8
|
fc7938eade40e9fed6cb92184abb2cc1
|
||||||
fbd2681363c185f4cb1be5aa42a27c31
|
0eb1a296df243b251df0643d53724cdb
|
||||||
21db7b2187fd11c1acf224a0d5a44466
|
5a92a1d6cb817804c4a9319b57d53be5
|
||||||
b4b5a3cc34ec0227fe40007e8b379654
|
80815bcfcb2df55018cc83fc43bc7ff8
|
||||||
f1e8e2b63c6b46ee7ab6f1bd82f57837
|
2d51f9b88364776ee9d12fc85cc7ea5b
|
||||||
92c209e8f25bc9ed493cb5c1d891ae72
|
9741c4f598c485316db066d52db4540e
|
||||||
7f54f4693c5b20f136ca23e639fd8ea0
|
212e1518a9bd4828219e24b20d88f598
|
||||||
865b4e22dd2af43e13e6b075f12427b2
|
a196c9de96012090e333519ae18d3509
|
||||||
08af9ffd09c56baa694165f57fe2697a
|
9427e7b372d348d352dc4c85e18cd4b9
|
||||||
3377fa34aebcba587c79941d83deaf45
|
3f8a56ddb2e64eb67adfc9b337157ff4
|
||||||
-----END OpenVPN Static key V1-----
|
-----END OpenVPN Static key V1-----
|
||||||
</tls-auth>
|
</tls-auth>
|
||||||
|
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -74,7 +74,7 @@ in {
|
||||||
nmap
|
nmap
|
||||||
pavucontrol
|
pavucontrol
|
||||||
powertop
|
powertop
|
||||||
rxvt_unicode_with-plugins
|
rxvt_unicode-with-plugins
|
||||||
sxiv
|
sxiv
|
||||||
taskwarrior
|
taskwarrior
|
||||||
termite
|
termite
|
||||||
|
|
|
@ -2,6 +2,7 @@ with import <stockholm/lib>;
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
<stockholm/krebs/2configs/nscd-fix.nix>
|
||||||
./binary-cache/client.nix
|
./binary-cache/client.nix
|
||||||
./gc.nix
|
./gc.nix
|
||||||
./mc.nix
|
./mc.nix
|
||||||
|
@ -81,9 +82,6 @@ with import <stockholm/lib>;
|
||||||
|
|
||||||
services.timesyncd.enable = mkForce true;
|
services.timesyncd.enable = mkForce true;
|
||||||
|
|
||||||
#why is this on in the first place?
|
|
||||||
services.nscd.enable = false;
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"d /tmp 1777 root root - -"
|
"d /tmp 1777 root root - -"
|
||||||
];
|
];
|
||||||
|
@ -115,6 +113,7 @@ with import <stockholm/lib>;
|
||||||
#network
|
#network
|
||||||
iptables
|
iptables
|
||||||
iftop
|
iftop
|
||||||
|
tcpdump
|
||||||
|
|
||||||
#stuff for dl
|
#stuff for dl
|
||||||
aria2
|
aria2
|
||||||
|
|
|
@ -96,6 +96,7 @@ with import <stockholm/lib>;
|
||||||
{ from = "nordvpn@lassul.us"; to = lass.mail; }
|
{ from = "nordvpn@lassul.us"; to = lass.mail; }
|
||||||
{ from = "csv-direct@lassul.us"; to = lass.mail; }
|
{ from = "csv-direct@lassul.us"; to = lass.mail; }
|
||||||
{ from = "nintendo@lassul.us"; to = lass.mail; }
|
{ from = "nintendo@lassul.us"; to = lass.mail; }
|
||||||
|
{ from = "overleaf@lassul.us"; to = lass.mail; }
|
||||||
];
|
];
|
||||||
system-aliases = [
|
system-aliases = [
|
||||||
{ from = "mailer-daemon"; to = "postmaster"; }
|
{ from = "mailer-daemon"; to = "postmaster"; }
|
||||||
|
|
|
@ -225,7 +225,7 @@ in {
|
||||||
msmtp
|
msmtp
|
||||||
mutt
|
mutt
|
||||||
pkgs.notmuch
|
pkgs.notmuch
|
||||||
pkgs.much
|
pkgs.haskellPackages.much
|
||||||
tag-new-mails
|
tag-new-mails
|
||||||
tag-old-mails
|
tag-old-mails
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,99 +1,107 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
with import <stockholm/lib>;
|
with import <stockholm/lib>;
|
||||||
|
|
||||||
{
|
let
|
||||||
krebs.Reaktor.coders = {
|
hooks = pkgs.reaktor2-plugins.hooks;
|
||||||
nickname = "Reaktor|lass";
|
in {
|
||||||
channels = [ "#coders" "#germany" "#panthermoderns" ];
|
krebs.reaktor2.coders = {
|
||||||
extraEnviron = {
|
hostname = "irc.hackint.org";
|
||||||
REAKTOR_HOST = "irc.hackint.org";
|
port = "9999";
|
||||||
};
|
useTLS = true;
|
||||||
plugins = with pkgs.ReaktorPlugins; let
|
nick = "reaktor2|lass";
|
||||||
|
plugins = [
|
||||||
lambdabot = (import (pkgs.fetchFromGitHub {
|
{
|
||||||
owner = "NixOS"; repo = "nixpkgs";
|
plugin = "register";
|
||||||
rev = "a4ec1841da14fc98c5c35cc72242c23bb698d4ac";
|
config = {
|
||||||
sha256 = "148fpw31s922hxrf28yhrci296f7c7zd81hf0k6zs05rq0i3szgy";
|
channels = [
|
||||||
}) {}).lambdabot;
|
"#coders"
|
||||||
|
"#germany"
|
||||||
lambdabotflags = ''
|
"#panthermoderns"
|
||||||
-XStandaloneDeriving -XGADTs -XFlexibleContexts \
|
];
|
||||||
-XFlexibleInstances -XMultiParamTypeClasses \
|
};
|
||||||
-XOverloadedStrings -XFunctionalDependencies \'';
|
}
|
||||||
in [
|
{
|
||||||
sed-plugin
|
plugin = "system";
|
||||||
url-title
|
config = {
|
||||||
(buildSimpleReaktorPlugin "lambdabot-pl" {
|
workdir = config.krebs.reaktor2.coders.stateDir;
|
||||||
pattern = "^@pl (?P<args>.*)$$";
|
hooks.PRIVMSG = [
|
||||||
script = pkgs.writeDash "lambda-pl" ''
|
hooks.sed
|
||||||
exec ${lambdabot}/bin/lambdabot \
|
hooks.url-title
|
||||||
${indent lambdabotflags}
|
{
|
||||||
-e "@pl $1"
|
activate = "match";
|
||||||
'';
|
pattern = ''@([^ ]+) (.*)$'';
|
||||||
})
|
command = 1;
|
||||||
(buildSimpleReaktorPlugin "lambdabot-type" {
|
arguments = [2];
|
||||||
pattern = "^@type (?P<args>.*)$$";
|
commands = let
|
||||||
script = pkgs.writeDash "lambda-type" ''
|
lambdabot = (import (pkgs.fetchFromGitHub {
|
||||||
exec ${lambdabot}/bin/lambdabot \
|
owner = "NixOS"; repo = "nixpkgs";
|
||||||
${indent lambdabotflags}
|
rev = "a4ec1841da14fc98c5c35cc72242c23bb698d4ac";
|
||||||
-e "@type $1"
|
sha256 = "148fpw31s922hxrf28yhrci296f7c7zd81hf0k6zs05rq0i3szgy";
|
||||||
'';
|
}) {}).lambdabot;
|
||||||
})
|
lambdabotWrapper = pkgs.writeDash "lambdabot.wrapper" ''
|
||||||
(buildSimpleReaktorPlugin "lambdabot-let" {
|
exec ${lambdabot}/bin/lambdabot \
|
||||||
pattern = "^@let (?P<args>.*)$$";
|
-XStandaloneDeriving -XGADTs -XFlexibleContexts \
|
||||||
script = pkgs.writeDash "lambda-let" ''
|
-XFlexibleInstances -XMultiParamTypeClasses \
|
||||||
exec ${lambdabot}/bin/lambdabot \
|
-XOverloadedStrings -XFunctionalDependencies \
|
||||||
${indent lambdabotflags}
|
-e "$@"
|
||||||
-e "@let $1"
|
'';
|
||||||
'';
|
in {
|
||||||
})
|
pl = {
|
||||||
(buildSimpleReaktorPlugin "lambdabot-run" {
|
env.HOME = config.krebs.reaktor2.coders.stateDir;
|
||||||
pattern = "^@run (?P<args>.*)$$";
|
filename = pkgs.writeDash "lambdabot-pl" ''
|
||||||
script = pkgs.writeDash "lambda-run" ''
|
${lambdabotWrapper} "@pl $1"
|
||||||
exec ${lambdabot}/bin/lambdabot \
|
'';
|
||||||
${indent lambdabotflags}
|
};
|
||||||
-e "@run $1"
|
type = {
|
||||||
'';
|
env.HOME = config.krebs.reaktor2.coders.stateDir;
|
||||||
})
|
filename = pkgs.writeDash "lambdabot-type" ''
|
||||||
(buildSimpleReaktorPlugin "lambdabot-kind" {
|
${lambdabotWrapper} "@type $1"
|
||||||
pattern = "^@kind (?P<args>.*)$$";
|
'';
|
||||||
script = pkgs.writeDash "lambda-kind" ''
|
};
|
||||||
exec ${lambdabot}/bin/lambdabot \
|
"let" = {
|
||||||
${indent lambdabotflags}
|
env.HOME = config.krebs.reaktor2.coders.stateDir;
|
||||||
-e "@kind $1"
|
filename = pkgs.writeDash "lambdabot-let" ''
|
||||||
'';
|
${lambdabotWrapper} "@let $1"
|
||||||
})
|
'';
|
||||||
(buildSimpleReaktorPlugin "ping" {
|
};
|
||||||
pattern = "^!ping (?P<args>.*)$$";
|
run = {
|
||||||
script = pkgs.writeDash "ping" ''
|
env.HOME = config.krebs.reaktor2.coders.stateDir;
|
||||||
exec /run/wrappers/bin/ping -q -c1 "$1" 2>&1 | tail -1
|
filename = pkgs.writeDash "lambdabot-run" ''
|
||||||
'';
|
${lambdabotWrapper} "@run $1"
|
||||||
})
|
'';
|
||||||
(buildSimpleReaktorPlugin "google" {
|
};
|
||||||
pattern = "^!g (?P<args>.*)$$";
|
kind = {
|
||||||
script = pkgs.writeDash "google" ''
|
env.HOME = config.krebs.reaktor2.coders.stateDir;
|
||||||
exec ${pkgs.ddgr}/bin/ddgr -C -n1 --json "$@" | \
|
filename = pkgs.writeDash "lambdabot-kind" ''
|
||||||
${pkgs.jq}/bin/jq '@text "\(.[0].abstract) \(.[0].url)"'
|
${lambdabotWrapper} "@kind $1"
|
||||||
'';
|
'';
|
||||||
})
|
};
|
||||||
(buildSimpleReaktorPlugin "blockchain" {
|
};
|
||||||
pattern = ".*[Bb]lockchain.*$$";
|
}
|
||||||
script = pkgs.writeDash "blockchain" ''
|
{
|
||||||
exec echo 'DID SOMEBODY SAY BLOCKCHAIN? https://paste.krebsco.de/r99pMoQq/+inline'
|
activate = "match";
|
||||||
'';
|
pattern = ''!([^ ]+)(?:\s*(.*))?'';
|
||||||
})
|
command = 1;
|
||||||
(buildSimpleReaktorPlugin "shrug" {
|
arguments = [2];
|
||||||
pattern = "^!shrug$";
|
commands = {
|
||||||
script = pkgs.writeDash "shrug" ''
|
ping.filename = pkgs.writeDash "ping" ''
|
||||||
exec echo '¯\_(ツ)_/¯'
|
exec /run/wrappers/bin/ping -q -c1 "$1" 2>&1 | tail -1
|
||||||
'';
|
'';
|
||||||
})
|
google.filename = pkgs.writeDash "google" ''
|
||||||
(buildSimpleReaktorPlugin "flip" {
|
exec ${pkgs.ddgr}/bin/ddgr -C -n1 --json "$@" | \
|
||||||
pattern = "^!flip$";
|
${pkgs.jq}/bin/jq '@text "\(.[0].abstract) \(.[0].url)"'
|
||||||
script = pkgs.writeDash "shrug" ''
|
'';
|
||||||
exec echo '(╯°□°)╯ ┻━┻'
|
shrug.filename = pkgs.writeDash "shrug" ''
|
||||||
'';
|
exec echo '¯\_(ツ)_/¯'
|
||||||
})
|
'';
|
||||||
|
table.filename = pkgs.writeDash "table" ''
|
||||||
|
exec echo '(╯°□°)╯ ┻━┻'
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -155,6 +155,13 @@ in {
|
||||||
ssl_key = "/var/lib/acme/lassul.us/key.pem";
|
ssl_key = "/var/lib/acme/lassul.us/key.pem";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
users.users.UBIK-SFTP = {
|
||||||
|
uid = genid_uint31 "UBIK-SFTP";
|
||||||
|
home = "/home/UBIK-SFTP";
|
||||||
|
useDefaultShell = true;
|
||||||
|
createHome = true;
|
||||||
|
};
|
||||||
|
|
||||||
users.users.xanf = {
|
users.users.xanf = {
|
||||||
uid = genid_uint31 "xanf";
|
uid = genid_uint31 "xanf";
|
||||||
home = "/home/xanf";
|
home = "/home/xanf";
|
||||||
|
@ -227,5 +234,22 @@ in {
|
||||||
createHome = true;
|
createHome = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.restic.backups.domsen = {
|
||||||
|
initialize = true;
|
||||||
|
extraOptions = [ "sftp.command='ssh efOVcMWSZ@wilhelmstr.duckdns.org -p 52222 -i ${toString <secrets> + "/ssh.id_ed25519"} -s sftp'" ];
|
||||||
|
repository = "sftp:efOVcMWSZ@wilhelmstr.duckdns.org:/mnt/UBIK-9TB-Pool/BACKUP/XXXX-MAX-UND-ANDERES";
|
||||||
|
passwordFile = toString <secrets> + "/domsen_backup_pw";
|
||||||
|
paths = [
|
||||||
|
"/srv/http"
|
||||||
|
"/home/domsen/Mail"
|
||||||
|
"/home/ms/Mail"
|
||||||
|
"/home/klabusterbeere/Mail"
|
||||||
|
"/home/jms/Mail"
|
||||||
|
"/home/bruno/Mail"
|
||||||
|
"/home/akayguen/Mail"
|
||||||
|
"/backups/sql_dumps"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,10 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
|
|
||||||
with pkgs;
|
|
||||||
{
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
much
|
pkgs.haskellPackages.much
|
||||||
msmtp
|
pkgs.msmtp
|
||||||
notmuch
|
pkgs.notmuch
|
||||||
pythonPackages.alot
|
pkgs.pythonPackages.alot
|
||||||
qprint
|
pkgs.qprint
|
||||||
w3m
|
pkgs.w3m
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user