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

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
tv 2017-12-05 18:42:27 +01:00
commit 18fad9c618
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -540,6 +540,7 @@ with import <stockholm/lib>;
wiki.euer IN A ${nets.internet.ip4.addr} wiki.euer IN A ${nets.internet.ip4.addr}
graph IN A ${nets.internet.ip4.addr} graph IN A ${nets.internet.ip4.addr}
ghook IN A ${nets.internet.ip4.addr} ghook IN A ${nets.internet.ip4.addr}
dockerhub IN A ${nets.internet.ip4.addr}
io IN NS gum.krebsco.de. io IN NS gum.krebsco.de.
''; '';
}; };

2
krebs/5pkgs/simple/krebszones/default.nix
View File

@ -2,7 +2,7 @@
pkgs.writeDashBin "krebszones" '' pkgs.writeDashBin "krebszones" ''
set -efu set -efu
export OVH_ZONE_CONFIG=$HOME/.secrets/krebs/ovh-zone.conf export OVH_ZONE_CONFIG=''${OVH_ZONE_CONFIG:-$HOME/.secrets/krebs/ovh-zone.conf}
case $* in case $* in
import) import)
set -- import /etc/zones/krebsco.de krebsco.de set -- import /etc/zones/krebsco.de krebsco.de

4
makefu/1systems/cake/config.nix
View File

@ -6,9 +6,6 @@
# configure your hw: # configure your hw:
# <stockholm/makefu/2configs/save-diskspace.nix> # <stockholm/makefu/2configs/save-diskspace.nix>
]; ];
users.extraUsers.root.openssh.authorizedKeys.keys = [
config.krebs.users.tv.pubkey
];
krebs = { krebs = {
enable = true; enable = true;
tinc.retiolum.enable = true; tinc.retiolum.enable = true;
@ -23,6 +20,7 @@
programs.man.enable = false; programs.man.enable = false;
services.nixosManual.enable = false; services.nixosManual.enable = false;
boot.tmpOnTmpfs = lib.mkForce false; boot.tmpOnTmpfs = lib.mkForce false;
sound.enable = false;
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
hardware.firmware = [ hardware.firmware = [

0
makefu/2configs/temp/elkstack.nix → makefu/2configs/deployment/scrape/elkstack.nix
View File

9
makefu/2configs/tools/studio.nix
View File

@ -5,6 +5,13 @@
obs-studio obs-studio
studio-link studio-link
audacity audacity
owncloudclient darkice
# owncloudclient
(pkgs.writeScriptBin "prepare-pulseaudio" ''
pactl load-module module-null-sink sink_name=stream sink_properties=device.description="Streaming"
pactl load-module module-loopback source=alsa_output.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo.monitor sink=stream latency_msec=1
pactl load-module module-loopback source=alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo sink=stream latency_msec=1
darkice -c ~/lol.conf
'')
]; ];
} }