summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2020-01-23 23:51:05 +0100
committermakefu <github@syntax-fehler.de>2020-01-23 23:51:05 +0100
commit6508c853da3596b701aa00e99a5260d31ebeaa24 (patch)
treea63df85ae8b1d63b902c07a6bf1fd04a838b2ff5
parente2fcbd0919015085b310d72198fb2e0250b5d1cd (diff)
shack/glados: schlechte_luft add rz
-rw-r--r--krebs/2configs/shack/glados/multi/schlechte_luft.nix5
-rw-r--r--makefu/2configs/default.nix5
2 files changed, 7 insertions, 3 deletions
diff --git a/krebs/2configs/shack/glados/multi/schlechte_luft.nix b/krebs/2configs/shack/glados/multi/schlechte_luft.nix
index 9cd2c56f4..4625f6846 100644
--- a/krebs/2configs/shack/glados/multi/schlechte_luft.nix
+++ b/krebs/2configs/shack/glados/multi/schlechte_luft.nix
@@ -15,6 +15,11 @@ in
(glados.esphome.temp { host = "fablab_feinstaub";})
(glados.esphome.dust_25m { host = "fablab_feinstaub";})
(glados.esphome.dust_100m { host = "fablab_feinstaub";})
+
+ (glados.esphome.temp { host = "rz_feinstaub";})
+ (glados.esphome.hum { host = "rz_feinstaub";})
+ (glados.esphome.dust_25m { host = "rz_feinstaub";})
+ (glados.esphome.dust_100m { host = "rz_feinstaub";})
];
automation =
[
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 5faf3ce93..0cbb5efe7 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -28,6 +28,7 @@ with import <stockholm/lib>;
openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
};
};
+ nix.trustedUsers = [ config.krebs.build.user.name ];
boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
@@ -41,8 +42,6 @@ with import <stockholm/lib>;
};
-
-
boot.tmpOnTmpfs = true;
systemd.tmpfiles.rules = [
"d /tmp 1777 root root - -"
@@ -61,7 +60,7 @@ with import <stockholm/lib>;
environment.shellAliases = {
# TODO: see .aliases
lsl = "ls -lAtr";
- dmesg = "journalctl -kb | cat";
+ dmesg = "dmesg -L --reltime";
psg = "ps -ef | grep";
nmap = "nmap -oN $HOME/loot/scan-`date +\%s`.nmap -oX $HOME/loot/scan-`date +%s`.xml";
grep = "grep --color=auto";