summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/bureautomation/kalauerbot.nix17
-rw-r--r--makefu/2configs/deployment/docker/template.md23
-rw-r--r--makefu/2configs/ham/default.nix13
-rw-r--r--makefu/2configs/ham/device_tracker/openwrt.nix10
-rw-r--r--makefu/2configs/home-manager/cli.nix25
-rw-r--r--makefu/2configs/hw/switch.nix6
-rw-r--r--makefu/2configs/stats/server.nix33
-rw-r--r--makefu/2configs/tools/consoles.nix1
-rw-r--r--makefu/2configs/tools/dev.nix3
9 files changed, 60 insertions, 71 deletions
diff --git a/makefu/2configs/bureautomation/kalauerbot.nix b/makefu/2configs/bureautomation/kalauerbot.nix
new file mode 100644
index 000000000..d61b8885e
--- /dev/null
+++ b/makefu/2configs/bureautomation/kalauerbot.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+{
+ systemd.services.kalauerbot = {
+ description = "Kalauerbot";
+ after = [ "network-online.target" ];
+ wantedBy = [ "multi-user.target" ];
+ environment = import <secrets/bureautomation/citadel.nix>;
+ serviceConfig = {
+ DynamicUser = true;
+ StateDirectory = "kalauerbot";
+ WorkingDirectory = "/var/lib/kalauerbot";
+ ExecStart = "${pkgs.kalauerbot}/bin/kalauerbot";
+ PrivateTmp = true;
+ };
+ };
+}
diff --git a/makefu/2configs/deployment/docker/template.md b/makefu/2configs/deployment/docker/template.md
index a26b2f042..690ce236e 100644
--- a/makefu/2configs/deployment/docker/template.md
+++ b/makefu/2configs/deployment/docker/template.md
@@ -1,15 +1,20 @@
# BGT<NUMBER>
-1. studio-link aufnehmen drücken (wichtig)
- - markus 6407eb63@studio-link.de
- - Felix1 1f1021b2@studio-link.de
- - L33tFelix 4d47a82a@studio-link.de
- - Ingo 03b33b4a@studio-link.de
+1. studio-link aufnehmen drücken, schauen ob file größer wird (wichtig)
+ - markus 6407eb63@studio-link.de
+ - Felix1 1f1021b2@studio-link.de
+ - L33tFelix 842f85eb@studio-link.de
+ - Ingo 03b33b4a@studio-link.de
2. audiocity starten, 48000Hz einstellen, Audio-Device checken und aufnehmen drücken (wichtig)
+ * alternativ:
+ `$ pacmd list-sources | grep -e device.string -e 'name:' # keins der "monitor" devices`
+ `$ parecord --channels=1 -d alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo bgt.wav`
3. obs starten und aufnehmen drücken (eher unwichtig)
-4. darkice starten (wichtig)
-4. klatschen
-5. Hallo und herzlich Willkommen
+5. darkice starten (wichtig)
+6. klatschen
+7. Hallihallo und Herzlich Willkommen
+8. chapter-marker starten mit ctrl-u auf "H" von "Halli" (wichtig)
+9. Blast markieren und ctrl-j drücken für neuen Eintrag
## Vorschläge
### Backlog von Picks und Lesefoo aus der letzten Woche
@@ -31,3 +36,5 @@
## Lesefoo
## Picks
+
+## Ende
diff --git a/makefu/2configs/ham/default.nix b/makefu/2configs/ham/default.nix
index c7e8733b7..8311a1a76 100644
--- a/makefu/2configs/ham/default.nix
+++ b/makefu/2configs/ham/default.nix
@@ -39,6 +39,15 @@ in {
];
};
config = {
+ influxdb = {
+ database = "ham";
+ host = "localhost:8086";
+ tags = {
+ instance = "omo";
+ source = "hass";
+ };
+ };
+
config = {};
input_select = zigbee.input_select; # dict
timer = zigbee.timer // kurzzeitwecker.timer; # dict
@@ -91,6 +100,7 @@ in {
];
sun.elevation = 247;
recorder = {};
+ device_tracker = (import ./device_tracker/openwrt.nix);
media_player = [
{ platform = "FireTV Stick kodi";
host = firetv_stick;
@@ -128,7 +138,7 @@ in {
};
luftdaten = {
show_on_map = true;
- sensor_id = 679;
+ sensor_id = 10529;
sensors.monitored_conditions = [ "P1" "P2" ];
};
#binary_sensor =
@@ -162,4 +172,5 @@ in {
configDir = hassdir;
};
+ state = [ "/var/lib/hass/known_devices.yaml" ];
}
diff --git a/makefu/2configs/ham/device_tracker/openwrt.nix b/makefu/2configs/ham/device_tracker/openwrt.nix
new file mode 100644
index 000000000..8173fcfcb
--- /dev/null
+++ b/makefu/2configs/ham/device_tracker/openwrt.nix
@@ -0,0 +1,10 @@
+[
+ { platform = "luci";
+ host = "192.168.1.5";
+ username = "root";
+ password = import <secrets/hass/router.nix>;
+ interval_seconds = 30; # instead of 12seconds
+ consider_home = 300; # 5 minutes timeout
+ new_device_defaults.track_new_devices = true;
+ }
+]
diff --git a/makefu/2configs/home-manager/cli.nix b/makefu/2configs/home-manager/cli.nix
index 5d5673b81..38d02424c 100644
--- a/makefu/2configs/home-manager/cli.nix
+++ b/makefu/2configs/home-manager/cli.nix
@@ -2,31 +2,6 @@
imports = [ ./zsh.nix ];
home-manager.users.makefu = {
programs.direnv = {
- stdlib = ''
-use_nix() {
- local cache=".direnv.$(nixos-version --hash)"
-
- if [[ ! -e "$cache" ]] || \
- [[ "$HOME/.direnvrc" -nt "$cache" ]] || \
- [[ ".envrc" -nt "$cache" ]] || \
- [[ "default.nix" -nt "$cache" ]] || \
- [[ "shell.nix" -nt "$cache" ]];
- then
- local tmp="$(mktemp "$${cache}.tmp-XXXXXXXX")"
- trap "rm -rf '$tmp' >/dev/null" EXIT
- nix-shell --show-trace "$@" --run 'direnv dump' > "$tmp" && \
- mv "$tmp" "$cache"
- fi
-
- direnv_load cat "$cache"
-
- if [[ $# = 0 ]]; then
- watch_file default.nix
- watch_file shell.nix
- rm direnv.* 2>/dev/null
- fi
-}
-'';
enableZshIntegration = true;
};
};
diff --git a/makefu/2configs/hw/switch.nix b/makefu/2configs/hw/switch.nix
index d46e8cf3f..79de7ffb1 100644
--- a/makefu/2configs/hw/switch.nix
+++ b/makefu/2configs/hw/switch.nix
@@ -2,9 +2,11 @@
{
- users.extraUsers.${config.krebs.build.user.name}.extraGroups = [ "plugdev" ];
-
+ users.users.makefu.extraGroups = [ "plugdev" ];
+ users.groups.plugdev = {};
services.udev.extraRules = ''
SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0664", GROUP="plugdev"
+ SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="27e2", SYMLINK+="switch-%k", MODE="0664", GROUP="plugdev"
+ SUBSYSTEM=="usb", ATTR{idVendor}=="057e", ATTR{idProduct}=="3000", SYMLINK+="switch-%k", MODE="0664", GROUP="plugdev"
'';
}
diff --git a/makefu/2configs/stats/server.nix b/makefu/2configs/stats/server.nix
index bb8fd1750..a2d0693ab 100644
--- a/makefu/2configs/stats/server.nix
+++ b/makefu/2configs/stats/server.nix
@@ -41,40 +41,7 @@ in {
bind-address = ":${toString collectd-port}";
}];
};
- krebs.kapacitor =
- let
- echoToIrc = pkgs.writeDash "echo_irc" ''
- set -euf
- data="$(${pkgs.jq}/bin/jq -r .message)"
- export LOGNAME=${irc-nick}
- ${pkgs.irc-announce}/bin/irc-announce \
- ${irc-server} 6667 ${irc-nick} \#noise "$data" >/dev/null
- '';
- in {
- enable = true;
- alarms = {
- cpu_deadman.database = db;
- cpu_deadman.text = ''
- var data = batch
- |query(${"'''"}
- SELECT mean("value") AS mean
- FROM "collectd_db"."default"."cpu_value"
- WHERE "type_instance" = 'idle' AND "type" = 'percent' fill(0)
- ${"'''"})
- .period(10m)
- .every(1m)
- .groupBy('host')
- data |alert()
- .crit(lambda: "mean" < 50)
- .stateChangesOnly()
- .exec('${echoToIrc}')
- data |deadman(1.0,5m)
- .stateChangesOnly()
- .exec('${echoToIrc}')
- '';
- };
- };
networking.firewall.extraCommands = ''
iptables -A INPUT -i retiolum -p udp --dport ${toString collectd-port} -j ACCEPT
iptables -A INPUT -i retiolum -p tcp --dport ${toString influx-port} -j ACCEPT
diff --git a/makefu/2configs/tools/consoles.nix b/makefu/2configs/tools/consoles.nix
index e54ff4ff5..a4c474c5b 100644
--- a/makefu/2configs/tools/consoles.nix
+++ b/makefu/2configs/tools/consoles.nix
@@ -7,5 +7,6 @@
cue2pops
nx_game_info
hactool
+ nsrenamer
];
}
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index 276ed6cdc..2acdcf69c 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -13,8 +13,7 @@
gi
flashrom
mosquitto
- nodemcu-uploader
- esptool
+ esphome
# nix related
nix-index
nix-review