Mic92
/
stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/19.09' into 19.09

This commit is contained in:
lassulus 2019-10-14 16:02:12 +02:00
parent 539f4f09fc 8273bcc77c
commit 7f7ce8077e
20 changed files with 173 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/1systems/puyak/config.nix
View File

@ -14,6 +14,8 @@
<stockholm/krebs/2configs/news.nix>
<stockholm/krebs/2configs/news-spam.nix>
<stockholm/krebs/2configs/shack/prometheus/node.nix>
<stockholm/krebs/2configs/shack/prometheus/server.nix>
<stockholm/krebs/2configs/shack/prometheus/unifi.nix>
<stockholm/krebs/2configs/shack/gitlab-runner.nix>
## Collect local statistics via collectd and send to collectd

4
krebs/1systems/wolf/config.nix
View File

@ -62,9 +62,9 @@ in
<stockholm/krebs/2configs/shack/netbox.nix>
# prometheus.shack
<stockholm/krebs/2configs/shack/prometheus/server.nix>
#<stockholm/krebs/2configs/shack/prometheus/server.nix>
<stockholm/krebs/2configs/shack/prometheus/node.nix>
<stockholm/krebs/2configs/shack/prometheus/unifi.nix>
#<stockholm/krebs/2configs/shack/prometheus/unifi.nix>
# grafana.shack
<stockholm/krebs/2configs/shack/grafana.nix>

2
krebs/2configs/shack/glados/multi/wasser.nix
View File

@ -12,7 +12,7 @@ let
retain = false;
qos = 1;
};
seconds = 30;
seconds = 20;
in
{
switch = [

2
krebs/2configs/shack/mqtt_sub.nix
View File

@ -29,6 +29,8 @@ in {
User = "nobody";
ExecStart = "${pkg}/bin/sub-new";
PrivateTmp = true;
Restart = "always";
RestartSec = "15";
};
};
}

3
krebs/2configs/shack/muell_caller.nix
View File

@ -33,9 +33,10 @@ in {
chown nobody /tmp/tell.json
'';
ExecStart = "${pkg}/bin/call-muell --cfg /tmp/tell.json --mode mpd loop 60";
Restart = "always";
PrivateTmp = true;
PermissionsStartOnly = true;
Restart = "always";
RestartSec = "15";
};
};
}

3
krebs/2configs/shack/muell_mail.nix
View File

@ -26,8 +26,9 @@ in {
WorkingDirectory = home;
PermissionsStartOnly = true;
ExecStart = "${pkg}/bin/muell_mail";
Restart = "always";
PrivateTmp = true;
Restart = "always";
RestartSec = "15";
};
};
}

3
krebs/2configs/shack/muellshack.nix
View File

@ -36,8 +36,9 @@ in {
'';
WorkingDirectory = home;
ExecStart = "${pkg}/bin/muellshack";
Restart = "always";
PrivateTmp = true;
Restart = "always";
RestartSec = "15";
};
};
}

3
krebs/2configs/shack/node-light.nix
View File

@ -46,8 +46,9 @@ in {
'';
WorkingDirectory = home;
ExecStart = "${pkg}/bin/node-light";
Restart = "always";
PrivateTmp = true;
Restart = "always";
RestartSec = "15";
};
};
}

6
krebs/2configs/shack/powerraw.nix
View File

@ -22,8 +22,9 @@ in {
serviceConfig = {
User = "powermeter";
ExecStart = "${pkg}/bin/powermeter-serial2mqtt";
Restart = "always";
PrivateTmp = true;
Restart = "always";
RestartSec = "15";
};
};
@ -33,8 +34,9 @@ in {
serviceConfig = {
User = "powermeter";
ExecStart = "${pkg}/bin/powermeter-mqtt2socket";
Restart = "always";
PrivateTmp = true;
Restart = "always";
RestartSec = "15";
};
};

3
krebs/2configs/shack/radioactive.nix
View File

@ -27,9 +27,10 @@ in {
serviceConfig = {
User = "nobody"; # TODO separate user
ExecStart = "${pkg}/bin/radioactive-add-many loop 60";
Restart = "always";
PrivateTmp = true;
PermissionsStartOnly = true;
Restart = "always";
RestartSec = "15";
};
};
}

2
krebs/3modules/makefu/default.nix
View File

@ -184,7 +184,7 @@ in {
nixos.unstable IN CNAME krebscode.github.io.
o.euer IN A ${nets.internet.ip4.addr}
photostore IN A ${nets.internet.ip4.addr}
pigstarter IN A ${nets.internet.ip4.addr}
pigstarter IN CNAME makefu.github.io.
share.euer IN A ${nets.internet.ip4.addr}
wg.euer IN A ${nets.internet.ip4.addr}
wiki.euer IN A ${nets.internet.ip4.addr}

6
krebs/nixpkgs.json
View File

@ -1,7 +1,7 @@
{
"url": "https://github.com/NixOS/nixpkgs-channels",
"rev": "88bbb3c809699f44bf844094a2cd7874e0ea4a39",
"date": "2019-10-09T11:39:27+02:00",
"sha256": "0vqwws2hhsx1g4kdhm2sz9m71n0jvjvhgv9ia7fjz679s3341032",
"rev": "7952807791daf3c60c99f10f371f732d897e3de8",
"date": "2019-10-13T01:14:01+02:00",
"sha256": "1h9wg0arazbyj8xfgvfhzn2gw6ya8sgcxscy1n5j182b5xri1xdk",
"fetchSubmodules": false
}

4
makefu/2configs/bureautomation/multi/10h_timers.nix
View File

@ -57,7 +57,7 @@ let
"Trotz schwerer Männergrippe ist ${name} heute im Büro erschienen.",
"${name} kenne keine Parteien mehr, ${name} kenne nur noch Arbeitsplätze",
"${name}, Frage nicht, was dein Arbeitsplatz für dich tun kann. Frage, was du für deinen Arbeitsplatz tun kannst",
"${name} läuft bis in den Jemen - für sein Unternehmen. ${name} schwimmt bis nach Birma - für meine Firma",
"${name} läuft bis in den Jemen - für sein Unternehmen. ${name} schwimmt bis nach Birma - für seine Firma",
"Der Cyberian ${name} ist gekommen um die Bahnwelt vor Cyber-Angriffen zu schützen",
"Alles paletto im Ghetto, ${name}?",
"Hach, ${name}, wenn du hier rein kommst fühlt es sich gleich wieder an wie Montag.",
@ -147,7 +147,7 @@ let
}
{ service = "homeassistant.turn_on";
entity_id = [
"switch.fernseher"
# "switch.fernseher"
"script.blitz_10s"
"script.announce_${name}"
];

95
makefu/2configs/bureautomation/multi/frosch.nix Normal file
View File

@ -0,0 +1,95 @@
{ lib }:
let
random_pommes = '' {{ [
"Nur ein Pommes Tag ist ein guter Tag",
"Schaut wie schön sie fliegen, die Pommes Seifenblasen",
"zwo ... eins ... Pommes Zeit",
"I cannot believe it is not Pommes",
"Naja, wenn es sonst schon nichts anderes gibt, kann man jetzt auch pommes nehmen",
"Wenn Aramark was kann, dann ist es frittieren",
"Einmal das Hauptgericht mit Pommes, ohne Hauptgericht",
"Rieche ich da etwa Pommes? JA!",
"Pommes ist auch nur Gemüse,also keine Reue und schlag zu!",
"Mit nur fünf Portionen Pommes kann man schon satt werden.",
"Heute für Sie, 15 Pommes von hand abgezählt",
"Der Weltmarktpreis von Pommes ist durch verschiedene Weltkrisen leider so hoch, dass Aramark den Verkaufspreis verdoppeln musste.",
"Vorfreude, schönste Freude, Freude bei Aramark. Pommes in die Schale rein, alle Kunden werden glücklich sein.",
"In 15 Minuten ist es wieder so weit, es ist Pommes Zeit!"] | random }}'';
in {
sensor = [
{ platform = "mqtt";
name = "frosch brightness";
device_class = "illuminance";
state_topic = "/bam/frosch/sensor/brightness/state";
availability_topic = "/bam/frosch/status";
payload_available = "online";
payload_not_available = "offline";
}
];
binary_sensor = [
{ platform = "mqtt";
name = "frosch auge";
state_topic = "/bam/frosch/binary_sensor/froschauge/state";
availability_topic = "/bam/frosch/status";
payload_available = "online";
payload_not_available = "offline";
}
];
switch = [
{ platform = "mqtt";
name = "frosch blasen";
state_topic = "/bam/frosch/switch/blasen/state";
command_topic = "/bam/frosch/switch/blasen/command";
availability_topic = "/bam/frosch/status";
payload_available = "online";
payload_not_available = "offline";
}
];
light = [];
automation = [
{ alias = "Pommeszeit";
trigger = {
platform = "time";
at = "12:15:00";
};
condition = {
condition = "state";
entity_id = "binary_sensor.pommes"; # from multi/aramark.nix
state = "on";
};
action = [
{ service = "homeassistant.turn_on";
entity_id = [
"script.pommes_announce"
"script.seifenblasen_30s" # from script/multi_blink.nix
];
}
];
}
];
script = {
pommes_announce = {
alias = "Random Pommes announce";
sequence = [
{
service = "media_player.play_media";
data = {
entity_id = "media_player.mpd";
media_content_type = "playlist";
media_content_id = "ansage";
};
}
{ delay.seconds = 5; }
{
service = "tts.google_say";
entity_id = "media_player.mpd";
data_template = {
message = random_pommes;
language = "de";
};
}
];
};
};
}

8
makefu/5pkgs/default.nix
View File

@ -28,10 +28,10 @@ in {
rclone = super.pkgs.stdenv.lib.overrideDerivation super.rclone (old: {
postInstall = old.postInstall + ''
$bin/bin/rclone genautocomplete zsh _rclone
install -D -m644 _rclone $bin/share/zsh/vendor-completions/_rclone
$bin/bin/rclone genautocomplete bash _rclone
install -D -m644 _rclone $bin/etc/bash_completion.d/rclone
$out/bin/rclone genautocomplete zsh _rclone
install -D -m644 _rclone $out/share/zsh/vendor-completions/_rclone
$out/bin/rclone genautocomplete bash _rclone
install -D -m644 _rclone $out/etc/bash_completion.d/rclone
'';
});
alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";};

7
makefu/5pkgs/pico2wave/default.nix
View File

@ -41,4 +41,11 @@ stdenv.mkDerivation rec {
--set NIX_REDIRECTS /usr/share/pico/lang=$out/share/pico/lang
'';
meta = with stdenv.lib; {
description = "Text-to-speech engine";
homepage = https://android.googlesource.com/platform/external/svox;
platforms = platforms.linux;
license = licenses.asl20;
maintainers = with maintainers; [ abbradar ];
};
}

6
makefu/5pkgs/pkg2zip/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, lib, pkgs, fetchFromGitHub, ... }:
stdenv.mkDerivation rec {
name = "pkg2zip-2017-12-01";
rev = "fccad26";
name = "pkg2zip-2018-06-15";
rev = "9222c4e00235dfe7914e9db0cc352da07e63d9f9";
src = fetchFromGitHub {
owner = "mmozeiko";
repo = "pkg2zip";
inherit rev;
sha256 = "1sq9yx5cbllmc0yyxhvb6c0yq1mkd1mn8njgkkgxz8alw9zwlarp";
sha256 = "1zz3vi12c2c4d48vvvkdl66fx5mdszcnv7lwwlgi4b8lfn1gvkr9";
};
installPhase = ''

40
makefu/5pkgs/python-firetv/default.nix
View File

@ -1,40 +0,0 @@
{ lib, pkgs, python2Packages, ... }:
# requires libusb1 from unstable
with python2Packages; let
python-adb = buildPythonPackage rec {
pname = "adb";
version = "1.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "0v4my47ikgkbq04gdllpx6kql5cfh7dnpq2fk72x03z74mqri7v8";
};
propagatedBuildInputs = [ libusb1 m2crypto ];
meta = {
homepage = https://github.com/google/python-adb;
description = "Python ADB + Fastboot implementation";
license = lib.licenses.asl20;
};
};
in
buildPythonPackage rec {
name = "python-firetv-${version}";
version = "1.0.5";
src = pkgs.fetchFromGitHub {
owner = "happyleavesaoc";
repo = "python-firetv";
# rev = version;
rev = "55406c6";
sha256 = "1r2yighilchs0jvcvbngkjxkk7gp588ikcl64x7afqzxc6zxv7wp";
};
propagatedBuildInputs = [ python-adb flask pyyaml ];
meta = {
homepage = https://github.com/happyleavesaoc/python-firetv;
description = "provides state informations and some control of an amazon firetv";
license = lib.licenses.mit;
};
}

6
makefu/5pkgs/shiori/default.nix
View File

@ -4,13 +4,13 @@ let
in
builder rec {
name = "shiori-${version}";
version = "1.6.0-master";
version = "1.6.0-warc";
goPackagePath = "github.com/go-shiori/shiori";
src = fetchFromGitHub {
owner = "go-shiori";
repo = "shiori";
rev = "c77b17caf8fcdf336adea33d0e4ac7ab13c10bc5";
sha256 = "11c5yxkmawwpswk256d151ixmj1vlnhrhsbfp9xan1v5cbqpkxdm";
rev = "83f133dd07bf661d3c4cf03043392100da489559";
sha256 = "02b17hjbh4w0ip0snd8hmdjmbc2w1pv9sws9cf9r8w09c225nw2i";
};
goDeps = ./deps.nix;
}

50
makefu/5pkgs/shiori/deps.nix
View File

@ -108,6 +108,15 @@
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "github.com/go-shiori/dom";
fetch = {
type = "git";
url = "https://github.com/go-shiori/dom";
rev = "6867c1fcf154";
sha256 = "10lhp58qy798vs5mazkhpxq4s5g42j2hps61y7c1npabp17k7zfm";
};
}
{
goPackagePath = "github.com/go-shiori/go-readability";
fetch = {
@ -117,6 +126,15 @@
sha256 = "1bhr5chria90v0iwr4rwgvid7cr6aj5r458cmv9f6idpylx5dxl3";
};
}
{
goPackagePath = "github.com/go-shiori/warc";
fetch = {
type = "git";
url = "https://github.com/go-shiori/warc";
rev = "7b3c5582fd83";
sha256 = "0cgwfbiv83mswl1sxqrycn9fsrc3z8ms2q5rm6mvr7rsp3v1m6g4";
};
}
{
goPackagePath = "github.com/go-sql-driver/mysql";
fetch = {
@ -401,8 +419,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.3.0";
sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
rev = "v1.4.0";
sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
};
}
{
@ -410,8 +428,8 @@
fetch = {
type = "git";
url = "https://github.com/tdewolff/parse";
rev = "v2.3.7";
sha256 = "014y2r3pf7x091x4hsclczmn734hpnn8f5lkaspq72jl3p21icj4";
rev = "v2.3.4";
sha256 = "00hclphbjgc5vjrqgnclp72v8c45k35vmj84d2a0f7bw8cc88zcd";
};
}
{
@ -419,8 +437,8 @@
fetch = {
type = "git";
url = "https://github.com/tdewolff/test";
rev = "v1.0.0";
sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj";
rev = "v1.0.5";
sha256 = "1f53nzfbs5gmn5bvqj3rzi15r9mxn8vq3f850rq3amwlfz927v9a";
};
}
{
@ -455,8 +473,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "4def268fd1a4";
sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6";
rev = "f99c8df09eb5";
sha256 = "0jwi6c6366999mnpzwx3a2kr7hzvdx97qfwiphx0r7cy0mpf28hf";
};
}
{
@ -473,8 +491,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "ca1201d0de80";
sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i";
rev = "d98b1b443823";
sha256 = "1vzwpy56g056dsq304xga3d55jg2cxx89bijpfwjlhwyqyskybsz";
};
}
{
@ -491,8 +509,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "51ab0e2deafa";
sha256 = "0xdhpckbql3bsqkpc2k5b1cpnq3q1qjqjjq2j3p707rfwb8nm91a";
rev = "c178f38b412c";
sha256 = "1r6v8xnvb4z5vdckbj6vd08kn6h4ivr9hvdpgq4drj6l1mp79rf7";
};
}
{
@ -509,8 +527,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "6d4652c779c4";
sha256 = "0dh2q4pkq2l3682d2win7wp9aahcm669s7aa77hqk9my8hdqskqs";
rev = "72853e10c5a3";
sha256 = "06v42k857lcivcar3fq8yjc782hny0m5yf20sb7ij5jva0gab026";
};
}
{
@ -527,8 +545,8 @@
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "v1.6.1";
sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry";
rev = "v1.6.4";
sha256 = "07r8zj9wk5w33bpmi808xgindqnfpvi4hf7glgcpimlg6n66lsrp";
};
}
{