From 35e89450893060a1b14ba7391e93321c1508038d Mon Sep 17 00:00:00 2001 From: Jeschli Date: Sat, 9 Nov 2019 13:58:15 +0100 Subject: j rust: add gcc --- jeschli/2configs/rust.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/jeschli/2configs/rust.nix b/jeschli/2configs/rust.nix index dbd90ebf5..46addb15c 100644 --- a/jeschli/2configs/rust.nix +++ b/jeschli/2configs/rust.nix @@ -3,5 +3,6 @@ { environment.systemPackages = with pkgs; [ rustup + gcc ]; } -- cgit v1.2.3 From 9b71c2f38c775c82d35d02cbe425d55625dd783d Mon Sep 17 00:00:00 2001 From: Jeschli Date: Sat, 9 Nov 2019 13:59:26 +0100 Subject: j reagenzglas: add rust --- jeschli/1systems/reagenzglas/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix index b6ae3c201..5d51a3738 100644 --- a/jeschli/1systems/reagenzglas/config.nix +++ b/jeschli/1systems/reagenzglas/config.nix @@ -6,6 +6,7 @@ + ./desktop.nix ./i3-configuration.nix -- cgit v1.2.3 From 13d5ec2fd65f7fb0e533ef3365142982495433a3 Mon Sep 17 00:00:00 2001 From: Jeschli Date: Sat, 9 Nov 2019 13:59:42 +0100 Subject: j reagenzglas: Add alacritty --- jeschli/1systems/reagenzglas/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix index 5d51a3738..7596f17d6 100644 --- a/jeschli/1systems/reagenzglas/config.nix +++ b/jeschli/1systems/reagenzglas/config.nix @@ -39,6 +39,7 @@ wget vim git rofi ag + alacritty ]; users.users.ombi = { -- cgit v1.2.3 From 2db63897ead64eec1d7e12a7d968af363acb9a93 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 17 Oct 2019 02:28:06 +0200 Subject: ma pkgs._4nxci: bump to 4.03 --- makefu/5pkgs/_4nxci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefu/5pkgs/_4nxci/default.nix b/makefu/5pkgs/_4nxci/default.nix index dafa37ff6..47c02aca4 100644 --- a/makefu/5pkgs/_4nxci/default.nix +++ b/makefu/5pkgs/_4nxci/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchFromGitHub, mbedtls, python2, perl }: let - version = "1.35"; + version = "4.03"; src = fetchFromGitHub { owner = "The-4n"; repo = "4NXCI"; rev = "v${version}"; - sha256 = "0yq0irxzi4wi71ajw8ld01zfpkrgknpq7g3m76pbnwmdzkm7dra6"; + sha256 = "0n49sqv6s8cj2dw1dbcyskfc2zr92p27f1bdd6jqfbawv0fqr1wf"; }; mymbedtls = stdenv.mkDerivation { -- cgit v1.2.3 From 10214c7582769db974ce87bfb13527f9773126a3 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Mon, 21 Oct 2019 23:55:22 +0200 Subject: external: change palos ssh key --- krebs/3modules/external/palo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/3modules/external/palo.nix b/krebs/3modules/external/palo.nix index e81dd9b58..aea1792f4 100644 --- a/krebs/3modules/external/palo.nix +++ b/krebs/3modules/external/palo.nix @@ -78,7 +78,7 @@ in { }; users = { palo = { - pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDBYNJVuyyZmc2pCkLWjhl0/hMMb7elmI81/9LAGtk8Tz4TmVderTMohwQkaTYznwPOPuKfU1sSMLCB8rYXdAO5nqWC4bGjXJ/+D8/UKfGjSqRQ7UkfpOF3NAm+pqUSFjaVXi1BWd+jxmsD0uRks0PyNSywZfgjn5LYpD3SpxyFy/17P/PJ9vX6PELjeYvNGH3l5cXDwYky3ZZJol7quBJ5yrA6I536A4wNDzg2ow+MRVu51/nIJdnbbsC/dDHgmdRWnStOzvsA+xSEMeKvLW3CaSPINr/bMGxOPrefr79bg59gkw9Wxp51fkx0o18N1liTRfWXau+GFNGMxFluELhfGXYOH9HLedLt8H38zs5vgJ9IY+tlOzMKud5njiNkuG503AiqY2H7coN7VeVA5+6L7tmwFbCMhPal4MS0VKHNBmCTDY5QMURYUajKiUh8n5IcbuTsPM+lEszm16g5iB+XQ1vpjza5ds6DRL1H6pUF/UpUzYUlqh2RnE+CyLsFO2MB/o72NoSWRfmn7/nsg6eEg/9kSn+dwj2ythjuEkMG28Yhm/XjaGnuAE/ZpIeRDozIQNGcHpzPHMd95olfNJW7+fLi+CvSFZa9l+tdS8PoRnCdHOsO4zvESJZ2rDn0Zt0Az6XNRJfYTABDlYPGCnWN4vmlnEJqQARSSiKBDhSgPw== palo@workout"; + pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6uza62+Go9sBFs3XZE2OkugBv9PJ7Yv8ebCskE5WYPcahMZIKkQw+zkGI8EGzOPJhQEv2xk+XBf2VOzj0Fto4nh8X5+Llb1nM+YxQPk1SVlwbNAlhh24L1w2vKtBtMy277MF4EP+caGceYP6gki5+DzlPUSdFSAEFFWgN1WPkiyUii15Xi3QuCMR8F18dbwVUYbT11vwNhdiAXWphrQG+yPguALBGR+21JM6fffOln3BhoDUp2poVc5Qe2EBuUbRUV3/fOU4HwWVKZ7KCFvLZBSVFutXCj5HuNWJ5T3RuuxJSmY5lYuFZx9gD+n+DAEJt30iXWcaJlmUqQB5awcB1S2d9pJ141V4vjiCMKUJHIdspFrI23rFNYD9k2ZXDA8VOnQE33BzmgF9xOVh6qr4G0oEpsNqJoKybVTUeSyl4+ifzdQANouvySgLJV/pcqaxX1srSDIUlcM2vDMWAs3ryCa0aAlmAVZIHgRhh6wa+IXW8gIYt+5biPWUuihJ4zGBEwkyVXXf2xsecMWCAGPWPDL0/fBfY9krNfC5M2sqxey2ShFIq+R/wMdaI7yVjUCF2QIUNiIdFbJL6bDrDyHnEXJJN+rAo23jUoTZZRv7Jq3DB/A5H7a73VCcblZyUmwMSlpg3wos7pdw5Ctta3zQPoxoAKGS1uZ+yTeZbPMmdbw=="; }; }; } -- cgit v1.2.3 From 8748e50be78e28ebb920b878bcb00d105103844b Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 23 Oct 2019 00:49:48 +0200 Subject: reaktor2: fix invalid character crash --- krebs/3modules/reaktor2.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/krebs/3modules/reaktor2.nix b/krebs/3modules/reaktor2.nix index 9ab207d88..837a9bea7 100644 --- a/krebs/3modules/reaktor2.nix +++ b/krebs/3modules/reaktor2.nix @@ -53,6 +53,9 @@ with import ; systemd.services = flip mapAttrs' config.krebs.reaktor2 (_: cfg: nameValuePair cfg.systemd-service-name { after = [ "network.target" ]; + environment = { + LC_ALL = "en_US.UTF-8"; + }; wantedBy = [ "multi-user.target" ]; serviceConfig = { User = cfg.username; -- cgit v1.2.3 From 692ef273e8db563a364da76821cc90df5dec16be Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 28 Oct 2019 07:38:07 +0100 Subject: shack/muellshack: mkYarnPackage is not vendored anymore, using pkgs.yarn2nix-moretea.mkYarnPackage --- krebs/2configs/shack/muellshack.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/2configs/shack/muellshack.nix b/krebs/2configs/shack/muellshack.nix index 9168c9ba7..179855c4c 100644 --- a/krebs/2configs/shack/muellshack.nix +++ b/krebs/2configs/shack/muellshack.nix @@ -6,7 +6,7 @@ let url = "https://git.shackspace.de/rz/muellshack"; rev = "d8a5e2d4c0a22804838675ac42b468299dcd9a76"; sha256 = "0ff6q64dgdxmpszp94z100fdic175b1vvxn4crg8p0jcabzxsv0m"; - }) {}; + }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; }; home = "/var/lib/muellshack"; port = "8081"; in { -- cgit v1.2.3 From be39568a2fd25b6b3ce1d4f339e9f53bd4842774 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 28 Oct 2019 11:00:11 +0100 Subject: rtorrent module: set listen.owner in phpfpm --- krebs/3modules/rtorrent.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix index d59569317..1f88a49e1 100644 --- a/krebs/3modules/rtorrent.nix +++ b/krebs/3modules/rtorrent.nix @@ -8,7 +8,7 @@ let nginx-user = config.services.nginx.user; nginx-group = config.services.nginx.group; - fpm-socket = "/var/run/php5-fpm-rutorrent.sock"; + fpm-socket = config.services.phpfpm.pools.rutorrent.socket; webdir = rucfg.webdir; systemd-logfile = cfg.workDir + "/rtorrent-systemd.log"; @@ -332,12 +332,11 @@ let rutorrent-imp = { services.phpfpm = { - # phpfpm does not have an enable option pools.rutorrent = { user = nginx-user; group = nginx-group; - listen = fpm-socket; settings = { + "listen.owner" = nginx-user; "pm" = "dynamic"; "pm.max_children" = 5; "pm.start_servers" = 2; -- cgit v1.2.3 From e2055f8e81e19c7cc6ea150bd4e8d4c1015fb685 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 28 Oct 2019 11:53:39 +0100 Subject: ma phpfpm: set listen.owner in config --- makefu/2configs/deployment/owncloud.nix | 1 + makefu/2configs/nginx/euer.wiki.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix index 59dfa3203..ed3155efc 100644 --- a/makefu/2configs/deployment/owncloud.nix +++ b/makefu/2configs/deployment/owncloud.nix @@ -127,6 +127,7 @@ let group = "nginx"; listen = socket; settings = { + "listen.owner" = "nginx"; "pm" = "dynamic"; "pm.max_children" = 32; "pm.max_requests" = 500; diff --git a/makefu/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix index a6766eeec..2f44d8cc1 100644 --- a/makefu/2configs/nginx/euer.wiki.nix +++ b/makefu/2configs/nginx/euer.wiki.nix @@ -27,6 +27,7 @@ in { inherit user group; listen = fpm-socket; settings = { + "listen.owner" = user; "pm" = "dynamic"; "pm.max_children" = 5; "pm.start_servers" = 2; -- cgit v1.2.3 From f4ebd3b3d110a29ba8d5f0ef5fc80518feae47b4 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 29 Oct 2019 17:16:12 +0100 Subject: ma bureautomation: set service name for google_say to fix regression --- makefu/2configs/bureautomation/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/makefu/2configs/bureautomation/default.nix b/makefu/2configs/bureautomation/default.nix index d745d894a..48c4c0b87 100644 --- a/makefu/2configs/bureautomation/default.nix +++ b/makefu/2configs/bureautomation/default.nix @@ -47,8 +47,14 @@ in { elevation = 303; auth_providers = [ { type = "homeassistant";} - { type = "legacy_api_password";} + # { type = "legacy_api_password";} { type = "trusted_networks"; + trusted_networks = [ + "127.0.0.1/32" + "192.168.8.0/24" + "::1/128" + "fd00::/8" + ]; # allow_bypass_login = true; } ]; @@ -141,19 +147,15 @@ in { # TODO: https://github.com/home-assistant/home-assistant/issues/16149 base_url = "http://192.168.8.11:8123"; api_password = "sistemas"; - trusted_networks = [ - "127.0.0.1/32" - "192.168.8.0/24" - "::1/128" - "fd00::/8" - ]; }; conversation = {}; history = {}; logbook = {}; tts = [ - { platform = "google"; + { platform = "google_translate"; language = "de"; + time_memory = 57600; + service_name = "google_say"; } { platform = "voicerss"; api_key = builtins.readFile ; -- cgit v1.2.3 From 3f5b67e68c1a78ef9f3c3c6499e48b4e00dc6c66 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 29 Oct 2019 17:26:15 +0100 Subject: ma bureautomation: fix home-assistant regression with darksky --- makefu/2configs/bureautomation/default.nix | 1 - makefu/2configs/bureautomation/sensor/outside.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/makefu/2configs/bureautomation/default.nix b/makefu/2configs/bureautomation/default.nix index 48c4c0b87..9492f6ac2 100644 --- a/makefu/2configs/bureautomation/default.nix +++ b/makefu/2configs/bureautomation/default.nix @@ -34,7 +34,6 @@ in { pkgs.pico2wave python-forecastio jsonrpc-async jsonrpc-websocket mpd2 (callPackage ./deps/gtts-token.nix { }) - (callPackage ./deps/pyhaversion.nix { }) ]; }; autoExtraComponents = true; diff --git a/makefu/2configs/bureautomation/sensor/outside.nix b/makefu/2configs/bureautomation/sensor/outside.nix index 7dbc192a4..596473f17 100644 --- a/makefu/2configs/bureautomation/sensor/outside.nix +++ b/makefu/2configs/bureautomation/sensor/outside.nix @@ -15,7 +15,7 @@ "uv_index" ]; units = "si" ; - update_interval = { days = 0; hours = 0; minutes = 30; seconds = 0; }; + scan_interval = "00:30:00"; } { platform = "luftdaten"; name = "Ditzingen"; -- cgit v1.2.3 From 2ac3254bd9dd4357c4c3d2880f7a127d3ff9d77c Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 30 Oct 2019 08:01:44 +0100 Subject: ma bureautomation: fix all the regression, add openwrt-luci-rpc as dependency --- makefu/2configs/bureautomation/default.nix | 9 +++--- makefu/2configs/bureautomation/deps/gtts-token.nix | 27 ----------------- .../bureautomation/deps/openwrt-luci-rpc.nix | 34 ++++++++++++++++++++++ .../2configs/bureautomation/deps/pyhaversion.nix | 33 --------------------- .../bureautomation/device_tracker/openwrt.nix | 1 - .../2configs/bureautomation/light/statuslight.nix | 8 ++--- makefu/2configs/bureautomation/sensor/pollen.nix | 2 +- 7 files changed, 44 insertions(+), 70 deletions(-) delete mode 100644 makefu/2configs/bureautomation/deps/gtts-token.nix create mode 100644 makefu/2configs/bureautomation/deps/openwrt-luci-rpc.nix delete mode 100644 makefu/2configs/bureautomation/deps/pyhaversion.nix diff --git a/makefu/2configs/bureautomation/default.nix b/makefu/2configs/bureautomation/default.nix index 9492f6ac2..e07e0ddf0 100644 --- a/makefu/2configs/bureautomation/default.nix +++ b/makefu/2configs/bureautomation/default.nix @@ -33,7 +33,7 @@ in { extraPackages = ps: with ps; [ pkgs.pico2wave python-forecastio jsonrpc-async jsonrpc-websocket mpd2 - (callPackage ./deps/gtts-token.nix { }) + (callPackage ./deps/openwrt-luci-rpc.nix { }) ]; }; autoExtraComponents = true; @@ -46,7 +46,9 @@ in { elevation = 303; auth_providers = [ { type = "homeassistant";} - # { type = "legacy_api_password";} + { type = "legacy_api_password"; + api_password = "sistemas"; + } { type = "trusted_networks"; trusted_networks = [ "127.0.0.1/32" @@ -124,7 +126,7 @@ in { aramark.binary_sensor; sensor = - [{ platform = "version"; }] ++ + # [{ platform = "version"; }] ++ # pyhaversion (import ./sensor/pollen.nix) ++ (import ./sensor/espeasy.nix) ++ (import ./sensor/airquality.nix) ++ @@ -145,7 +147,6 @@ in { http = { # TODO: https://github.com/home-assistant/home-assistant/issues/16149 base_url = "http://192.168.8.11:8123"; - api_password = "sistemas"; }; conversation = {}; history = {}; diff --git a/makefu/2configs/bureautomation/deps/gtts-token.nix b/makefu/2configs/bureautomation/deps/gtts-token.nix deleted file mode 100644 index 69640f03d..000000000 --- a/makefu/2configs/bureautomation/deps/gtts-token.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, requests -}: - -buildPythonPackage rec { - pname = "gtts-token"; - version = "1.1.3"; - - src = fetchPypi { - pname = "gTTS-token"; - inherit version; - sha256 = "9d6819a85b813f235397ef931ad4b680f03d843c9b2a9e74dd95175a4bc012c5"; - }; - - propagatedBuildInputs = [ - requests - ]; - - meta = with lib; { - description = "Calculates a token to run the Google Translate text to speech"; - homepage = https://github.com/boudewijn26/gTTS-token; - license = licenses.mit; - # maintainers = [ maintainers. ]; - }; -} diff --git a/makefu/2configs/bureautomation/deps/openwrt-luci-rpc.nix b/makefu/2configs/bureautomation/deps/openwrt-luci-rpc.nix new file mode 100644 index 000000000..4eceeb146 --- /dev/null +++ b/makefu/2configs/bureautomation/deps/openwrt-luci-rpc.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, click +, requests +, packaging +}: + +buildPythonPackage rec { + pname = "openwrt-luci-rpc"; + version = "1.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "174a1f6c0bb2a2ed76e5299d14e2be05c612e8bcd4c15b9a9aedee1ef8e18b90"; + }; + + patchPhase = '' + sed -i -e "s/requests==2.21.0/requests/" -e "s/packaging==19.1/packaging/" setup.py + ''; + + propagatedBuildInputs = [ + click + requests + packaging + ]; + + meta = with lib; { + description = "Module for interacting with OpenWrt Luci RPC interface"; + homepage = https://github.com/fbradyirl/openwrt-luci-rpc; + license = licenses.asl20; + maintainers = [ maintainers.makefu ]; + }; +} diff --git a/makefu/2configs/bureautomation/deps/pyhaversion.nix b/makefu/2configs/bureautomation/deps/pyhaversion.nix deleted file mode 100644 index a75c6a976..000000000 --- a/makefu/2configs/bureautomation/deps/pyhaversion.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchpatch -, fetchPypi -, aiohttp -, async-timeout -}: - -buildPythonPackage rec { - pname = "pyhaversion"; - version = "2.2.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "72b65aa25d7b2dbb839a4d0218df2005c2335e93526035904d365bb668030b9f"; - }; - patches = [ - (fetchpatch { url = "https://github.com/makefu/pyhaversion/commit/f3bdc38970272cd345c2cfbde3037ea492ca27c4.patch"; - sha256 = - "1rhq4z7mdgnwhwpf5fmarnbc1ba3qysk1wqjdr0hvbzi8vmvbfcc";}) - ]; - doCheck = false; - propagatedBuildInputs = [ - aiohttp - async-timeout - ]; - - meta = with lib; { - description = ""; - homepage = https://github.com/ludeeus/pyhaversion; - # maintainers = [ maintainers. ]; - }; -} diff --git a/makefu/2configs/bureautomation/device_tracker/openwrt.nix b/makefu/2configs/bureautomation/device_tracker/openwrt.nix index d32eab60f..5de216474 100644 --- a/makefu/2configs/bureautomation/device_tracker/openwrt.nix +++ b/makefu/2configs/bureautomation/device_tracker/openwrt.nix @@ -3,7 +3,6 @@ [ { platform = "luci"; - name = "router"; host = "192.168.8.1"; username = "root"; password = import ; diff --git a/makefu/2configs/bureautomation/light/statuslight.nix b/makefu/2configs/bureautomation/light/statuslight.nix index 31f52f492..c9d301758 100644 --- a/makefu/2configs/bureautomation/light/statuslight.nix +++ b/makefu/2configs/bureautomation/light/statuslight.nix @@ -24,13 +24,13 @@ let brightness_command_topic = "/bam/${topic}/cmnd/Dimmer"; brightness_scale = 100; # color - rgb_state_topic = "/bam/${topic}/stat/Color"; + rgb_state_topic = "/bam/${topic}/stat/RESULT"; rgb_command_topic = "/bam/${topic}/cmnd/Color2"; - rgb_command_mode = "hex"; - rgb_command_template = "{{ '%02x%02x%02x' | format(red, green, blue)}}"; + rgb_value_template = "{{(value_json.Channel[0]*2.55)|int}},{{(value_json.Channel[1]*2.55)|int}},{{(value_json.Channel[2]*2.55)|int}}"; + # effects effect_state_topic = "/bam/${topic}/tele/STATE"; - effects_value_template = "{{value_json.Scheme|default(0)}}"; + effect_value_template = "{{value_json.Scheme|default(0)}}"; effect_command_topic = "/bam/${topic}/cmnd/Scheme"; effect_list = [ 0 # single color for LED light diff --git a/makefu/2configs/bureautomation/sensor/pollen.nix b/makefu/2configs/bureautomation/sensor/pollen.nix index 506dbf123..8ddb49e58 100644 --- a/makefu/2configs/bureautomation/sensor/pollen.nix +++ b/makefu/2configs/bureautomation/sensor/pollen.nix @@ -1,6 +1,6 @@ [ { platform = "dwd_pollen"; - partsregion_ids = [ + partregion_ids = [ 112 ]; } -- cgit v1.2.3 From 0251e941c395e808f68d8e548420a9d8e5486459 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 31 Oct 2019 15:17:18 +0100 Subject: shack/*: fix regression with mkYarnPackage and pypi2nix generated files --- krebs/2configs/shack/muell_mail.nix | 4 +-- krebs/2configs/shack/muellshack.nix | 4 +-- krebs/2configs/shack/node-light.nix | 6 ++-- krebs/2configs/shack/s3-power.nix | 7 +++-- krebs/2configs/shack/worlddomination.nix | 2 +- makefu/2configs/bureautomation/person/team.nix | 38 +++++++++++++++++++++++++- 6 files changed, 49 insertions(+), 12 deletions(-) diff --git a/krebs/2configs/shack/muell_mail.nix b/krebs/2configs/shack/muell_mail.nix index 5ae80d780..409278954 100644 --- a/krebs/2configs/shack/muell_mail.nix +++ b/krebs/2configs/shack/muell_mail.nix @@ -4,8 +4,8 @@ let pkg = pkgs.callPackage ( pkgs.fetchgit { url = "https://git.shackspace.de/rz/muell_mail"; - rev = "861ec25ab22797d8961efb32e72d79e113aa9f0f"; - sha256 = "sha256:18cw95zbr7isv4cw80cbpd84n5z208fwh5390i6j10jkn398mjq2"; + rev = "57b67c95052d90044137b2c89007a371dc389afd"; + sha256 = "1grkzs6fxjnc2bv4kskj63d5sb4qxz6yyr85nj0da9hn7qkk4jkj"; }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; }; home = "/var/lib/muell_mail"; cfg = toString ; diff --git a/krebs/2configs/shack/muellshack.nix b/krebs/2configs/shack/muellshack.nix index 179855c4c..c1c957da3 100644 --- a/krebs/2configs/shack/muellshack.nix +++ b/krebs/2configs/shack/muellshack.nix @@ -4,8 +4,8 @@ let pkg = pkgs.callPackage ( pkgs.fetchgit { url = "https://git.shackspace.de/rz/muellshack"; - rev = "d8a5e2d4c0a22804838675ac42b468299dcd9a76"; - sha256 = "0ff6q64dgdxmpszp94z100fdic175b1vvxn4crg8p0jcabzxsv0m"; + rev = "4601f59787de090c83be6dbae6ca72d7fc84ab9f"; + sha256 = "1cshbd6ipvynbm3gmnsm58ccc1m5xc87cpd3b6jx0s6pr2j19g9j"; }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; }; home = "/var/lib/muellshack"; port = "8081"; diff --git a/krebs/2configs/shack/node-light.nix b/krebs/2configs/shack/node-light.nix index 8cf0007b8..38cb3b55d 100644 --- a/krebs/2configs/shack/node-light.nix +++ b/krebs/2configs/shack/node-light.nix @@ -4,9 +4,9 @@ let pkg = pkgs.callPackage ( pkgs.fetchgit { url = "https://git.shackspace.de/rz/node-light.git"; - rev = "a32c782650c4cc0adf51250fe249167d7246c59b"; - sha256 = "0clvcp1m2ay0a9ibh7s21q7d9a6nam3497bysvc6mdygblks22qy"; - }) {}; + rev = "32d8064db5172b8068f633211c8bd5688b2c8773"; + sha256 = "14jzhs7pp3hq42wq3cwqarivn1z7vcgksfzfqfc4yyh21096yi1j"; + }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; }; home = "/var/lib/node-light"; port = "8082"; in { diff --git a/krebs/2configs/shack/s3-power.nix b/krebs/2configs/shack/s3-power.nix index 40c42260f..f3ea67f79 100644 --- a/krebs/2configs/shack/s3-power.nix +++ b/krebs/2configs/shack/s3-power.nix @@ -4,9 +4,10 @@ let pkg = pkgs.callPackage ( pkgs.fetchgit { url = "https://git.shackspace.de/rz/s3-power"; - rev = "b2b87b56bb40d714dbbecd1285566870b256aec4"; - sha256 = "sha256:02wikwf3rgkkggwbwqisdvhlwd38w5pw011xhwvhnj114s3rynan"; - }) {}; + rev = "0687ab64"; + sha256 = "1m8h4bwykv24bbgr5v51mam4wsbp5424xcrawhs4izv563jjf130"; + }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; }; + home = "/var/lib/s3-power"; cfg = toString ; in { diff --git a/krebs/2configs/shack/worlddomination.nix b/krebs/2configs/shack/worlddomination.nix index 44176a341..b38b9cab4 100644 --- a/krebs/2configs/shack/worlddomination.nix +++ b/krebs/2configs/shack/worlddomination.nix @@ -65,7 +65,7 @@ let }; LinkHeader = pythonPackages.buildPythonPackage { name = "LinkHeader-0.4.3"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/27/d4/eb1da743b2dc825e936ef1d9e04356b5701e3a9ea022c7aaffdf4f6b0594/LinkHeader-0.4.3.tar.gz"; sha256 = "7fbbc35c0ba3fbbc530571db7e1c886e7db3d718b29b345848ac9686f21b50c3"; }; + src = pkgs.fetchurl { url = "https://files.pythonhosted.org/packages/27/d4/eb1da743b2dc825e936ef1d9e04356b5701e3a9ea022c7aaffdf4f6b0594/LinkHeader-0.4.3.tar.gz"; sha256 = "7fbbc35c0ba3fbbc530571db7e1c886e7db3d718b29b345848ac9686f21b50c3"; }; propagatedBuildInputs = [ ]; meta = with pkgs.stdenv.lib; { homepage = ""; diff --git a/makefu/2configs/bureautomation/person/team.nix b/makefu/2configs/bureautomation/person/team.nix index e18c42194..fc2d9ba17 100644 --- a/makefu/2configs/bureautomation/person/team.nix +++ b/makefu/2configs/bureautomation/person/team.nix @@ -3,7 +3,7 @@ id = 1; device_trackers = [ "device_tracker.thorsten_phone" - "device_tracker.thorsten_arbeitphone" + #"device_tracker.thorsten_arbeitphone" ]; } { name = "Felix"; @@ -26,4 +26,40 @@ "device_tracker.daniel_phone" ]; } + { name = "Thierry"; + id = 5; + device_trackers = [ + "device_tracker.thierry_phone" + ]; + } + { name = "Frank"; + id = 6; + device_trackers = [ + "device_tracker.frank_phone" + ]; + } + { name = "Carsten"; + id = 7; + device_trackers = [ + "device_tracker.carsten_phone" + ]; + } + { name = "Emeka"; + id = 8; + device_trackers = [ + "device_tracker.emeka_phone" + ]; + } + #{ name = "Sabine"; + # id = 9; + # device_trackers = [ + # "device_tracker.sabine_phone" + # ]; + #} + { name = "Tobias"; + id = 10; + device_trackers = [ + "device_tracker.tobias_phone" + ]; + } ] -- cgit v1.2.3 From cb2e450741074630fab426c260990273e84cfa24 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 31 Oct 2019 15:19:04 +0100 Subject: wolf.r: disable swap --- krebs/1systems/wolf/config.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index e47c43fe1..e87b7bb99 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -117,10 +117,6 @@ in fileSystems."/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; }; - swapDevices = [ - { device = "/dev/disk/by-label/swap"; } - ]; - users.extraUsers.root.openssh.authorizedKeys.keys = [ config.krebs.users."0x4A6F".pubkey config.krebs.users.ulrich.pubkey -- cgit v1.2.3 From 8bd87288e93f3197a61207ce7dc3d076f81d5d67 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 29 Oct 2019 19:33:55 +0100 Subject: nixpkgs: 7952807 -> c75de8b --- krebs/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 01230b439..fabd3691a 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "7952807791daf3c60c99f10f371f732d897e3de8", - "date": "2019-10-13T01:14:01+02:00", - "sha256": "1h9wg0arazbyj8xfgvfhzn2gw6ya8sgcxscy1n5j182b5xri1xdk", + "rev": "c75de8bc12cc7e713206199e5ca30b224e295041", + "date": "2019-10-27T17:40:06+01:00", + "sha256": "1awipcjfvs354spzj2la1nzmi9rh2ci2mdapzf4kkabf58ilra6x", "fetchSubmodules": false } -- cgit v1.2.3 From bd290c616295623d0a35ecb54d98de909f4ba101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 30 Oct 2019 18:08:24 +0000 Subject: l: add host amy/clara MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Thalheim --- krebs/3modules/external/default.nix | 56 +++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 1546cac62..247dae69c 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -354,6 +354,62 @@ in { }; }; }; + amy = { + owner = config.krebs.users.Mic92; + nets = rec { + retiolum = { + addrs = [ + config.krebs.hosts.donna.nets.retiolum.ip4.addr + config.krebs.hosts.donna.nets.retiolum.ip6.addr + ]; + ip4.addr = "10.243.29.181"; + aliases = [ "amy.r" ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAr3jQRA1+hLKYVgHJA2ax5W8J3GVMTnaGpYw9Q2xXXrX/jxLZ6Ia8 + hBjIcCBDVL5Q3FnyrKB9NJeeIvCOKg8WG+8O0+wKcePKd0Vhbsx4Whog/6PWs6qh + q2sURs2tp1hjHks4kZo2WtiYD7Ue9HHdV6FlUO6yuBV0bW2RzHdLPCDSGxnQVkBM + tSwAvMCZwvVBiv4m6RyMXqmpdbAPBzgJcmJS0FY+zGxpiwsR/AdoVvnzYyFMCVpG + iFl5+k9OGhUJq72MwAXzjW5ZdCPrG+2Dd+QBhhtIMJGA2sJiJteT8vdvpTNCiHJ/ + HnW7movliN2mW86qwo7QqB5v0c9f9TjfpOld7sS/4vE3zlGi/Stf6SQWaoXez/u3 + /P9GzupcYgj76m8Z3j7BMHXCBw8iwP2pZpL9hnLdIyCcyLrzXDIzq4hlt60DPhSU + klTDBUA/cUdSJGcSn2N+WHLOTfI6qeBNKqcTk70OQsa69jAJeAtA+I9OprNYOXqb + MmQakNNlrTaNtGQxfQqEL+wqHlo8CVDGm3O9pQSNF309P4TLNU1EYm+ItScNiVCE + DKhcgvE6xHCwZnVyJN8MMy1CVyDmnHVYoaTEZ2cCvNi/hXIXgO9KWjSpAv5tP764 + UkOE4dlDpEW6G1pNf84BERfRYGDj29A/Jk9LJC/6D09QJXNu18HR0sUCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; + clara = { + owner = config.krebs.users.Mic92; + nets = rec { + retiolum = { + addrs = [ + config.krebs.hosts.donna.nets.retiolum.ip4.addr + config.krebs.hosts.donna.nets.retiolum.ip6.addr + ]; + ip4.addr = "10.243.29.182"; + aliases = [ "clara.r" ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEA07G1n2sA804nnjWQzq0Fi9i6kxJUo+jVJjtkm5unw3hjflAAd/3d + WN+01GdJCk/gr7DfU/Xr5KnR39Z3ADoT1tbUb+i5AJZ5/8VHUwWM8D8mQAam6LBf + UEeLxhVH8rG6lHaKwVi9oe4gPhgptUOzX/YIlJOMYDlYRxc7Wbj7YQOAKlPuTAjY + Z5bLswfkqTMO0cioJNwwMCNWSMJf3jbKi3eTQ36sf7TDMEneNGSBUpeSjGddoNT/ + rrVIDDT8tGmtACKr+3Y0H+EA2K5IxdQKKfnPRR31RBWiTkEXBbaJzYO/ZV5/xlbN + wmblskwq9d9IwDY7qeMctci+ZUZ3epG8MUwYa4faOrgmmkQpa5B+6UOMzw/WDJEc + jTfvSzfPo4anoj8C+MOQYzRvYmp60YEZKomv2BQdBvpGIpUul8WAR2aV0K+wz66e + mUamljAXmLiPxgGKduX5VFVuXzYxeMiBBujQCLTjc+xTB2EdwihxNX1rkxz10BDc + WrgPV+/VVyThKhOvVCifWARHtT2VGcZazfQOW/y3ZmEPOYuc5ZvrSEiMeG3f64+v + UU8cQZ3yBLIhTtC+38pRlsdBQHt526q0j0rrnd30JXVAUdWBunP2UJ5QGtA8/mWn + cWSlvRf5sfbyrISz6+mLPM2qGHnCkKwORNxmv/1DY07O3Rn6hX0OY4ECAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; inspector = { owner = config.krebs.users.Mic92; nets = rec { -- cgit v1.2.3 From b57466a0f20e43513281c16fba7d2b5c3fddd1a6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 31 Oct 2019 13:09:39 +0100 Subject: l mors.r: remove broken ts3 client --- lass/1systems/mors/config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 1477d6d8b..03ff42132 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -129,7 +129,6 @@ with import ; cac-api sshpass get - teamspeak_client hashPassword urban mk_sql_pair -- cgit v1.2.3 From 870ababd5eeaa1924598afdd0b76c5e218ce2503 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 2 Nov 2019 14:03:14 +0100 Subject: l uriel: enableAllFirmware -> enableRedistributableFirmware --- lass/1systems/uriel/physical.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/1systems/uriel/physical.nix b/lass/1systems/uriel/physical.nix index 9ac3468a8..2d21f00d5 100644 --- a/lass/1systems/uriel/physical.nix +++ b/lass/1systems/uriel/physical.nix @@ -3,7 +3,7 @@ ./config.nix ]; - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; boot = { #kernelParams = [ # "acpi.brightness_switch_enabled=0" -- cgit v1.2.3 From 6838f3b01210043e8e3984bddb7dbdac2cebd14f Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 2 Nov 2019 15:05:01 +0100 Subject: nixpkgs-unstable: 4cd2cb4 -> 471869c --- krebs/nixpkgs-unstable.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index 5f8f0c771..a772c83a2 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "d484f2b7fc0834a068e8ace851faa449a03963f5", - "date": "2019-09-20T22:58:43+02:00", - "sha256": "0jk93ikryi2hqc30l2n5i4vlgmklrlzb8cf7b3sg1q3k70q344jn", + "rev": "471869c9185fb610e67940a701eb13b1cfb335a4", + "date": "2019-10-31T16:03:13+01:00", + "sha256": "1klbclz8n4b9k1kfwv806bqdavld1mg32l1vxsmnrqzr6zck1c54", "fetchSubmodules": false } -- cgit v1.2.3 From f1bbc460189c30fda87d838d5af95d1d4875ef3c Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 5 Nov 2019 22:13:43 +0100 Subject: nixpkgs: c75de8b -> c5aabb0 --- krebs/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index fabd3691a..7fe43b4b5 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "c75de8bc12cc7e713206199e5ca30b224e295041", - "date": "2019-10-27T17:40:06+01:00", - "sha256": "1awipcjfvs354spzj2la1nzmi9rh2ci2mdapzf4kkabf58ilra6x", + "rev": "c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31", + "date": "2019-10-31T21:10:56+01:00", + "sha256": "15fwszhn6078sbrb8qk83g8afvh4qnmvff0qbkbvq3cm1fxni2w1", "fetchSubmodules": false } -- cgit v1.2.3 From 4563c446f1ea13af69bdc03614b66bdf09c66154 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 6 Nov 2019 08:56:20 +0100 Subject: nixpkgs-unstable: 471869c -> 7827d3f --- krebs/nixpkgs-unstable.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index a772c83a2..4829bec1d 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "471869c9185fb610e67940a701eb13b1cfb335a4", - "date": "2019-10-31T16:03:13+01:00", - "sha256": "1klbclz8n4b9k1kfwv806bqdavld1mg32l1vxsmnrqzr6zck1c54", + "rev": "7827d3f4497ed722fedca57fd4d5ca1a65c38256", + "date": "2019-11-03T11:21:05+01:00", + "sha256": "1ixjkb2ksri83iyhvl4a7hrfnb8zd3ps5jmirgaa7b617jn31cg6", "fetchSubmodules": false } -- cgit v1.2.3 From 296d0ebdb16460e19c370185b83adc6985c1cad5 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 5 Nov 2019 23:01:37 +0100 Subject: ma bureautomation: add frosch,daily-standup --- makefu/2configs/bureautomation/default.nix | 84 +++++++++++++--------- .../2configs/bureautomation/multi/10h_timers.nix | 4 +- .../bureautomation/multi/daily-standup.nix | 54 ++++++++++++++ makefu/2configs/bureautomation/multi/frosch.nix | 2 +- 4 files changed, 107 insertions(+), 37 deletions(-) create mode 100644 makefu/2configs/bureautomation/multi/daily-standup.nix diff --git a/makefu/2configs/bureautomation/default.nix b/makefu/2configs/bureautomation/default.nix index e07e0ddf0..c55bc1d14 100644 --- a/makefu/2configs/bureautomation/default.nix +++ b/makefu/2configs/bureautomation/default.nix @@ -4,7 +4,9 @@ let ten_hours = import ./multi/10h_timers.nix { inherit lib; }; # provides: timer automation script mittagessen = import ./multi/mittagessen.nix { inherit lib; }; # provides: automation script matrix = import ./multi/matrix.nix { inherit lib; }; # provides: matrix automation - aramark = import ./multi/aramark.nix { inherit lib; }; # provides: pommes sensor + frosch = import ./multi/frosch.nix { inherit lib; }; # provides: sensor binary_sensor switch light script automation + aramark = import ./multi/aramark.nix { inherit lib; }; # provides: sensor binary_sensor + standup = import ./multi/daily-standup.nix { inherit lib; }; # provides: automation script in { imports = [ ./ota.nix @@ -88,10 +90,12 @@ in { retain = true; }; }; - switch = (import ./switch/tasmota_switch.nix) ++ - (import ./switch/rfbridge.nix); - light = (import ./light/statuslight.nix) ++ - (import ./light/buzzer.nix); + switch = (import ./switch/tasmota_switch.nix) + ++ frosch.switch + ++ (import ./switch/rfbridge.nix); + light = (import ./light/statuslight.nix) + ++ (import ./light/buzzer.nix) + ++ frosch.light; timer = ten_hours.timer; notify = [ { @@ -117,31 +121,34 @@ in { ]; script = lib.fold lib.recursiveUpdate {} [ ((import ./script/multi_blink.nix) {inherit lib;}) + frosch.script ten_hours.script mittagessen.script + standup.script ]; binary_sensor = - (import ./binary_sensor/buttons.nix) ++ - (import ./binary_sensor/motion.nix) ++ - aramark.binary_sensor; + (import ./binary_sensor/buttons.nix) + ++ (import ./binary_sensor/motion.nix) + ++ frosch.binary_sensor + ++ aramark.binary_sensor; sensor = # [{ platform = "version"; }] ++ # pyhaversion - (import ./sensor/pollen.nix) ++ - (import ./sensor/espeasy.nix) ++ - (import ./sensor/airquality.nix) ++ - ((import ./sensor/outside.nix) {inherit lib;}) ++ - (import ./sensor/influxdb.nix) ++ - (import ./sensor/tasmota_firmware.nix) ++ - aramark.sensor; + (import ./sensor/pollen.nix) + ++ (import ./sensor/espeasy.nix) + ++ (import ./sensor/airquality.nix) + ++ ((import ./sensor/outside.nix) {inherit lib;}) + ++ (import ./sensor/influxdb.nix) + ++ (import ./sensor/tasmota_firmware.nix) + ++ frosch.sensor + ++ aramark.sensor; camera = (import ./camera/verkehrskamera.nix) ++ (import ./camera/comic.nix); - # not yet released - #person = - # (import ./person/team.nix ); + person = + (import ./person/team.nix ); frontend = { }; http = { @@ -196,13 +203,22 @@ in { "light.buslicht" ]; team = [ - "device_tracker.thorsten_phone" - "device_tracker.felix_phone" - "device_tracker.ecki_tablet" - "device_tracker.daniel_phone" - "device_tracker.carsten_phone" - "device_tracker.thierry_phone" - "device_tracker.frank_phone" + "person.thorsten" + #"device_tracker.thorsten_phone" + "person.felix" + "person.ecki" + "person.daniel" + # "person.carsten" + "person.thierry" + "person.frank" + "person.emeka" + #"device_tracker.felix_phone" + #"device_tracker.ecki_tablet" + #"device_tracker.daniel_phone" + #"device_tracker.carsten_phone" + #"device_tracker.thierry_phone" + #"device_tracker.frank_phone" + #"device_tracker.emeka_phone" # "person.thorsten" # "person.felix" # "person.ecki" @@ -237,8 +253,6 @@ in { ]; sensors = [ "media_player.kodi" - "script.blitz_10s" - "script.buzz_red_led_fast" "timer.felix_10h" "timer.frank_10h" "sensor.easy2_dht22_humidity" @@ -262,13 +276,15 @@ in { # feedreader.urls = [ "http://www.heise.de/security/rss/news-atom.xml" ]; # we don't use imports because the expressions do not merge in # home-assistant - automation = (import ./automation/bureau-shutdown.nix) ++ - (import ./automation/nachtlicht.nix) ++ - (import ./automation/schlechteluft.nix) ++ - (import ./automation/hass-restart.nix) ++ - ten_hours.automation ++ - matrix.automation ++ - mittagessen.automation; + automation = (import ./automation/bureau-shutdown.nix) + ++ (import ./automation/nachtlicht.nix) + ++ (import ./automation/schlechteluft.nix) + ++ (import ./automation/hass-restart.nix) + ++ ten_hours.automation + ++ matrix.automation + ++ standup.automation + ++ frosch.automation + ++ mittagessen.automation; device_tracker = (import ./device_tracker/openwrt.nix ); }; }; diff --git a/makefu/2configs/bureautomation/multi/10h_timers.nix b/makefu/2configs/bureautomation/multi/10h_timers.nix index 8cdaa8cfd..73709e738 100644 --- a/makefu/2configs/bureautomation/multi/10h_timers.nix +++ b/makefu/2configs/bureautomation/multi/10h_timers.nix @@ -122,7 +122,7 @@ let trigger = { platform = "state"; # TODO: ecki - entity_id = [ "device_tracker.${name}_phone"]; + entity_id = [ "person.${name}"]; from = "not_home"; to = "home"; }; @@ -166,7 +166,7 @@ let condition = { condition = "state"; - entity_id = "device_tracker.${name}_phone"; + entity_id = "person.${name}"; state = "home"; }; diff --git a/makefu/2configs/bureautomation/multi/daily-standup.nix b/makefu/2configs/bureautomation/multi/daily-standup.nix new file mode 100644 index 000000000..f5bd85b9d --- /dev/null +++ b/makefu/2configs/bureautomation/multi/daily-standup.nix @@ -0,0 +1,54 @@ +{ lib }: +let + random_daily_text = ''{{ [ + "Es ist so weit, es ist Standup Zeit!", + "Zehn Uhr Fünfunddreissig ist genau die richtige Zeit für ein Standup!", + "Hat jeder seine Hausaufgaben gemacht? Bitte einmal aufstehen und den Zettel nach rechts geben", + "Aufstehen zum Appell, es wird die Anwesenheit kontrolliert!", + "Hallo Kinder, wisst ihr welche Zeit es ist??? ... Genau! ... Standup Zeit!", + "Morgens, halb elf in Deutschland - das Standupchen" ] | random }}''; + +in { + script = + { "random_daily" = { + alias = "Random Daily Introduction"; + + 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_daily_text; + language = "de"; + }; + } + ]; + }; + }; + automation = [ + { + alias = "Daily Standup"; + trigger = { + platform = "time"; + at = "10:35:00"; + }; + action = + [ + { service = "homeassistant.turn_on"; + entity_id = [ + "script.blitz_10s" + "script.random_daily" + ]; + } + ]; + + } + ]; +} diff --git a/makefu/2configs/bureautomation/multi/frosch.nix b/makefu/2configs/bureautomation/multi/frosch.nix index de93ce2b7..c0e267b69 100644 --- a/makefu/2configs/bureautomation/multi/frosch.nix +++ b/makefu/2configs/bureautomation/multi/frosch.nix @@ -1,6 +1,6 @@ { lib }: +# needs: binary_sensor.pommes let - random_pommes = '' {{ [ "Nur ein Pommes Tag ist ein guter Tag", "Schaut wie schön sie fliegen, die Pommes Seifenblasen", -- cgit v1.2.3 From d6ddc019837ad752c585916757dd63587b9c3486 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 7 Nov 2019 00:25:01 +0100 Subject: shack/node-light: bump to latest hash --- krebs/2configs/shack/node-light.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/2configs/shack/node-light.nix b/krebs/2configs/shack/node-light.nix index 38cb3b55d..9e3828463 100644 --- a/krebs/2configs/shack/node-light.nix +++ b/krebs/2configs/shack/node-light.nix @@ -4,8 +4,8 @@ let pkg = pkgs.callPackage ( pkgs.fetchgit { url = "https://git.shackspace.de/rz/node-light.git"; - rev = "32d8064db5172b8068f633211c8bd5688b2c8773"; - sha256 = "14jzhs7pp3hq42wq3cwqarivn1z7vcgksfzfqfc4yyh21096yi1j"; + rev = "9c3fe451897cf170fb192a2643180fdfe22388e8"; + sha256 = "1zsc38idg452r8wpcna5m3yqx0ri11bd1bw60bl0kpz96dqqnyba"; }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; }; home = "/var/lib/node-light"; port = "8082"; -- cgit v1.2.3 From a53e57ca86e97608308cae8d0c7a63df9c850c19 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 7 Nov 2019 00:25:42 +0100 Subject: shack/glados: fix regression, disable influx publisher, disable archiving --- krebs/2configs/shack/glados/default.nix | 43 +++++++++++++++------------------ 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/krebs/2configs/shack/glados/default.nix b/krebs/2configs/shack/glados/default.nix index dc345cc4e..a94e28375 100644 --- a/krebs/2configs/shack/glados/default.nix +++ b/krebs/2configs/shack/glados/default.nix @@ -53,20 +53,24 @@ in { elevation = 303; auth_providers = [ { type = "homeassistant";} - { type = "legacy_api_password";} { type = "trusted_networks"; - # allow_bypass_login = true; + trusted_networks = [ + "127.0.0.1/32" + "10.42.0.0/16" + "::1/128" + "fd00::/8" + ]; } ]; }; # https://www.home-assistant.io/components/influxdb/ - influxdb = { - database = "hass"; - tags = { - instance = "wolf"; - source = "hass"; - }; - }; + #influxdb = { + # database = "hass"; + # tags = { + # instance = "wolf"; + # source = "hass"; + # }; + #}; mqtt = { broker = "localhost"; port = 1883; @@ -110,26 +114,19 @@ in { base_url = "http://hass.shack"; use_x_forwarded_for = true; trusted_proxies = "127.0.0.1"; - api_password = "shackit"; - trusted_networks = [ - "127.0.0.1/32" - "10.42.0.0/16" - "::1/128" - "fd00::/8" - ]; }; - conversation = {}; - history = {}; - logbook = {}; + #conversation = {}; + #history = {}; + #logbook = {}; tts = [ { platform = "google"; language = "de"; } - { platform = "picotts"; - language = "de-DE"; - } + #{ platform = "picotts"; + # language = "de-DE"; + #} ]; - recorder = {}; + #recorder = {}; sun = {}; automation = wasser.automation; -- cgit v1.2.3 From 78a4aee51bc8e7b65bdf9a5f4cc0f01f466a045c Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 7 Nov 2019 09:47:29 +0100 Subject: shack/glados: remove version, google -> google_translate --- krebs/2configs/shack/glados/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/krebs/2configs/shack/glados/default.nix b/krebs/2configs/shack/glados/default.nix index a94e28375..d000af397 100644 --- a/krebs/2configs/shack/glados/default.nix +++ b/krebs/2configs/shack/glados/default.nix @@ -39,8 +39,6 @@ in { })).override { extraPackages = ps: with ps; [ python-forecastio jsonrpc-async jsonrpc-websocket mpd2 - (callPackage ./deps/gtts-token.nix { }) - (callPackage ./deps/pyhaversion.nix { }) ]; }; autoExtraComponents = true; @@ -99,8 +97,7 @@ in { ]; sensor = - [{ platform = "version"; }] - ++ (import ./sensors/hass.nix) + (import ./sensors/hass.nix) ++ (import ./sensors/power.nix) ++ shackopen.sensor; @@ -109,8 +106,8 @@ in { camera = []; frontend = { }; + config = { }; http = { - # TODO: https://github.com/home-assistant/home-assistant/issues/16149 base_url = "http://hass.shack"; use_x_forwarded_for = true; trusted_proxies = "127.0.0.1"; @@ -119,7 +116,7 @@ in { #history = {}; #logbook = {}; tts = [ - { platform = "google"; + { platform = "google_translate"; language = "de"; } #{ platform = "picotts"; -- cgit v1.2.3 From 9f06dc9a23354a99524fab208f4522446cd39bce Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 7 Nov 2019 10:59:12 +0100 Subject: ma: hardware.enableAllFirmware -> hardware.enableRedistributableFirmware what could possibly go wrong?! --- makefu/1systems/darth/config.nix | 2 +- makefu/1systems/repunit/config.nix | 2 +- makefu/1systems/tsp/config.nix | 2 +- makefu/2configs/fs/cac-boot-partition.nix | 3 +-- makefu/2configs/hw/tp-x2x0.nix | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/makefu/1systems/darth/config.nix b/makefu/1systems/darth/config.nix index 046c1574c..4e71d1426 100644 --- a/makefu/1systems/darth/config.nix +++ b/makefu/1systems/darth/config.nix @@ -41,7 +41,7 @@ in { makefu.server.primary-itf = "enp0s25"; # krebs.hidden-ssh.enable = true; boot.kernelModules = [ "coretemp" "f71882fg" ]; - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; nixpkgs.config.allowUnfree = true; networking = { wireless.enable = true; diff --git a/makefu/1systems/repunit/config.nix b/makefu/1systems/repunit/config.nix index 996abff08..5589cc0a2 100644 --- a/makefu/1systems/repunit/config.nix +++ b/makefu/1systems/repunit/config.nix @@ -21,7 +21,7 @@ boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "virtio_blk" ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; hardware.cpu.amd.updateMicrocode = true; # networking.firewall is enabled by default diff --git a/makefu/1systems/tsp/config.nix b/makefu/1systems/tsp/config.nix index 2921e2bcf..bbfaebd44 100644 --- a/makefu/1systems/tsp/config.nix +++ b/makefu/1systems/tsp/config.nix @@ -34,6 +34,6 @@ 25 ]; - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; nixpkgs.config.allowUnfree = true; } diff --git a/makefu/2configs/fs/cac-boot-partition.nix b/makefu/2configs/fs/cac-boot-partition.nix index 3d59a25dd..14480bc4a 100644 --- a/makefu/2configs/fs/cac-boot-partition.nix +++ b/makefu/2configs/fs/cac-boot-partition.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: # vda1 ext4 (label nixos) -> only root partition -with import ; { boot.loader.grub.enable = true; boot.loader.grub.version = 2; @@ -16,6 +15,6 @@ with import ; fsType = "ext4"; }; - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; nixpkgs.config.allowUnfree = true; } diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix index 564925db5..f4578bf77 100644 --- a/makefu/2configs/hw/tp-x2x0.nix +++ b/makefu/2configs/hw/tp-x2x0.nix @@ -15,7 +15,7 @@ networking.wireless.enable = lib.mkDefault true; - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; nixpkgs.config.allowUnfree = true; hardware.cpu.intel.updateMicrocode = true; -- cgit v1.2.3 From e41e7606202a0cfaca60fd9a14fb849f13f66edb Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 7 Nov 2019 11:28:54 +0100 Subject: ma pkgs.bin2iso: use mirror of original sources --- makefu/5pkgs/bin2iso/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/makefu/5pkgs/bin2iso/default.nix b/makefu/5pkgs/bin2iso/default.nix index 31d05fab3..676fa5b83 100644 --- a/makefu/5pkgs/bin2iso/default.nix +++ b/makefu/5pkgs/bin2iso/default.nix @@ -1,19 +1,17 @@ -{ stdenv, lib, pkgs, fetchurl }: +{ stdenv, lib, pkgs, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "bin2iso"; version = "1.9b"; - _dlver = builtins.replaceStrings ["."] [""] version; - name = "${pname}-${version}"; - src = fetchurl { - url = "http://users.eastlink.ca/~doiron/${pname}/linux/${pname}${_dlver}_linux.c"; - sha256 = "0gg4hbzlm83nnbccy79dnxbwpn7lxl3fb87ka36mlclikvknm2hy"; + src = fetchFromGitHub { + owner = "einsteinx2"; + repo = "bin2iso"; + rev = "a08f6f93b833878dc009fe59da072643f06a7830"; + sha256 = "1bnhj8z7wbq2v070zkx0xal6hx37y20a068gpy95zh13vihvbgh3"; }; - unpackPhase = "true"; - buildPhase ='' - gcc -Wall -o $pname $src + gcc -Wall -o $pname $src/src/linux_macos/${pname}_v${version}_linux.c ''; installPhase = '' @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://users.eastlink.ca/~doiron/bin2iso/ ; + homepage = https://github.com/einsteinx2/bin2iso; description = "converts bin+cue to iso"; license = lib.licenses.gpl3; }; -- cgit v1.2.3 From 0efba8f8079851cc5bea920b819abb1e9df5785e Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 7 Nov 2019 11:51:32 +0100 Subject: ma wbob.r: hardware.enableRedistributableFirmware --- makefu/1systems/wbob/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix index 3306279b9..d8cf380e7 100644 --- a/makefu/1systems/wbob/config.nix +++ b/makefu/1systems/wbob/config.nix @@ -145,7 +145,7 @@ in { #}; # rt2870.bin wifi card, part of linux-unfree - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; nixpkgs.config.allowUnfree = true; # rt2870 with nonfree creates wlp2s0 from wlp0s20u2 # not explicitly setting the interface results in wpa_supplicant to crash -- cgit v1.2.3 From d9129f61a817f4d05714cf4f963e3d3ae7e6952c Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 23 Oct 2019 21:00:14 +0200 Subject: krops: 1.16.0 -> 1.17.0 --- submodules/krops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/krops b/submodules/krops index 8f4446000..2dc172530 160000 --- a/submodules/krops +++ b/submodules/krops @@ -1 +1 @@ -Subproject commit 8f44460003ae10f543ccb6a29f15b57e42ca3aad +Subproject commit 2dc172530965ea4f1ead8ff166004c5734daee1f -- cgit v1.2.3 From 5180acf37fed6f4cf5986ef646c4ddcd22d13257 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 12 Nov 2019 18:52:08 +0100 Subject: exim: remove because upstream has caught up --- krebs/5pkgs/override/default.nix | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 krebs/5pkgs/override/default.nix diff --git a/krebs/5pkgs/override/default.nix b/krebs/5pkgs/override/default.nix deleted file mode 100644 index 704831823..000000000 --- a/krebs/5pkgs/override/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -with import ; -self: super: { - - exim = super.exim.overrideAttrs (old: rec { - name = warnOldVersion old.name "exim-4.92.2"; - src = self.fetchurl { - url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; - sha256 = "0m56jsh2fzvwj4rdpcc3pkd5vsi40cjrpzalis7l1zq33m4axmq1"; - }; - }); - -} -- cgit v1.2.3 From d1696783866c47f66a64a808fc91f49f9181bae8 Mon Sep 17 00:00:00 2001 From: Jeschli Date: Thu, 14 Nov 2019 15:34:49 +0100 Subject: j emacs: udpate --- jeschli/2configs/emacs-org-agenda.nix | 4 ++-- jeschli/2configs/emacs.nix | 40 +++++++++++++++++++++++------------ 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/jeschli/2configs/emacs-org-agenda.nix b/jeschli/2configs/emacs-org-agenda.nix index 79540977c..f9139fcfe 100644 --- a/jeschli/2configs/emacs-org-agenda.nix +++ b/jeschli/2configs/emacs-org-agenda.nix @@ -114,8 +114,8 @@ let ("NEXT" ("WAITING") ("CANCELLED") ("HOLD")) ("DONE" ("WAITING") ("CANCELLED") ("HOLD"))))) -(setq org-directory "~/git/org") -(setq org-default-notes-file "~/git/org/refile.org") +(setq org-directory "~/projects/notes_private") +(setq org-default-notes-file "~/projects/notes_private/refile.org") ;; I use C-c c to start capture mode (global-set-key (kbd "C-c c") 'org-capture) diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix index 46354bd62..f866bbca9 100644 --- a/jeschli/2configs/emacs.nix +++ b/jeschli/2configs/emacs.nix @@ -62,9 +62,6 @@ let magit = '' (global-set-key (kbd "C-x g") 'magit-status) ; "Most Magit commands are commonly invoked from the status buffer" - - (with-eval-after-load 'magit - (require 'forge)) ''; windowCosmetics = '' @@ -163,6 +160,11 @@ let (global-set-key (kbd "") 'delete-other-windows) ''; + lspMode = '' + (require 'lsp-mode) + (add-hook 'rust-mode-hook #'lsp) + ''; + dotEmacs = pkgs.writeText "dot-emacs" '' ${packageRepos} @@ -177,11 +179,20 @@ let ${orgAgendaView} ${myFunctionKeys} + ${lspMode} ''; #emacsWithCustomPackages emacsPkgs= epkgs: [ - #testing + # testing lsp mode + epkgs.melpaPackages.lsp-ui + epkgs.melpaPackages.company-lsp + epkgs.melpaPackages.lsp-treemacs + epkgs.melpaPackages.helm-lsp + epkgs.melpaPackages.dap-mode + epkgs.melpaPackages.lsp-mode + + # testing epkgs.melpaPackages.web-mode epkgs.melpaPackages.js2-mode epkgs.melpaPackages.xref-js2 @@ -189,7 +200,6 @@ let epkgs.melpaPackages.academic-phrases epkgs.melpaPackages.gitlab - epkgs.melpaPackages.forge epkgs.melpaPackages.helm epkgs.melpaPackages.weechat @@ -200,6 +210,7 @@ let epkgs.melpaPackages.evil epkgs.melpaPackages.google-this epkgs.melpaPackages.monokai-alt-theme + epkgs.melpaPackages.zenburn-theme # development epkgs.melpaPackages.magit @@ -208,7 +219,7 @@ let epkgs.melpaPackages.haskell-mode # rust epkgs.melpaPackages.rust-mode - epkgs.melpaPackages.flycheck-rust +# epkgs.melpaPackages.flycheck-rust epkgs.melpaPackages.racer # python @@ -219,16 +230,19 @@ let epkgs.orgPackages.org-plus-contrib epkgs.melpaPackages.smex epkgs.melpaPackages.org-mime + epkgs.melpaPackages.orgit + epkgs.elpaPackages.which-key ]; -emacsWithOverlay = (pkgsWithOverlay.emacsWithPackagesFromUsePackage { - config = builtins.readFile dotEmacs; # builtins.readFile ./emacs.el; - # Package is optional, defaults to pkgs.emacs - package = pkgsWithOverlay.emacsGit; - # Optionally provide extra packages not in the configuration file - extraEmacsPackages = emacsPkgs; - }); + + emacsWithOverlay = pkgsWithOverlay.emacsWithPackagesFromUsePackage { + config = builtins.readFile dotEmacs; # builtins.readFile ./emacs.el; + # Package is optional, defaults to pkgs.emacs + package = pkgsWithOverlay.emacsGit; + # Optionally provide extra packages not in the configuration file + extraEmacsPackages = emacsPkgs; + }; myEmacs = pkgs.writeDashBin "my-emacs" '' exec ${emacsWithOverlay}/bin/emacs -q -l ${dotEmacs} "$@" -- cgit v1.2.3 From ebc0a63cb7115c80b71a45b6e9959452f567ff1e Mon Sep 17 00:00:00 2001 From: Jeschli Date: Thu, 14 Nov 2019 15:54:06 +0100 Subject: j krops: fix unstable --- jeschli/krops.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeschli/krops.nix b/jeschli/krops.nix index 9a8a76676..59edd4273 100644 --- a/jeschli/krops.nix +++ b/jeschli/krops.nix @@ -11,7 +11,7 @@ nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix"; nixpkgs-unstable.git = { url = "https://github.com/nixos/nixpkgs-channels"; - ref = "nixos-unstable"; + ref = (lib.importJSON ../krebs/nixpkgs-unstable.json).rev; }; secrets = if test then { file = toString ./2configs/tests/dummy-secrets; -- cgit v1.2.3