summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2020-07-22 22:51:26 +0200
committerlassulus <lassulus@lassul.us>2020-07-22 22:51:26 +0200
commit9a877083b017e6882517f7cf44419f221f2decc1 (patch)
treebad379cf1d0959e7eec27673bcbf09f1e0c28a24 /makefu
parent9fdc801bb79a57757851e7d4727b428af6ddc705 (diff)
parentd1989632cfd88a747c98c3a0edab45922fbf1884 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/cake/config.nix2
-rw-r--r--makefu/1systems/omo/config.nix2
-rw-r--r--makefu/1systems/sdev/config.nix1
-rw-r--r--makefu/1systems/sdev/source.nix4
-rw-r--r--makefu/1systems/tsp/config.nix1
-rw-r--r--makefu/1systems/tsp/source.nix1
-rw-r--r--makefu/1systems/wbob/config.nix1
-rw-r--r--makefu/1systems/wbob/source.nix1
-rw-r--r--makefu/2configs/bureautomation/multi/matrix.nix2
9 files changed, 11 insertions, 4 deletions
diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix
index eaaac8f41..3befa201d 100644
--- a/makefu/1systems/cake/config.nix
+++ b/makefu/1systems/cake/config.nix
@@ -10,7 +10,7 @@ in {
<stockholm/makefu/2configs/binary-cache/nixos.nix>
#<stockholm/makefu/2configs/support-nixos.nix>
<stockholm/makefu/2configs/homeautomation/default.nix>
- <stockholm/makefu/2configs/homeautomation/google-muell.nix>
+ # <stockholm/makefu/2configs/homeautomation/google-muell.nix>
# configure your hw:
# <stockholm/makefu/2configs/save-diskspace.nix>
];
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 423ebb4c6..dd89b4057 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -87,12 +87,10 @@ in {
# <stockholm/makefu/2configs/syncthing.nix>
<stockholm/makefu/2configs/remote-build/slave.nix>
# TODO:
- # <stockholm/makefu/2configs/deployment/google-muell.nix>
<stockholm/makefu/2configs/virtualisation/docker.nix>
<stockholm/makefu/2configs/bluetooth-mpd.nix>
<stockholm/makefu/2configs/ham>
- <stockholm/makefu/2configs/ham/google-muell.nix>
<stockholm/makefu/2configs/ham/zigbee2mqtt>
{
makefu.ps3netsrv = {
diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
index 66f822c02..e3c59e181 100644
--- a/makefu/1systems/sdev/config.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -5,6 +5,7 @@
imports =
[ # Include the results of the hardware scan.
<stockholm/makefu>
+ <stockholm/makefu/2configs/home-manager>
# <stockholm/makefu/2configs/hw/vbox-guest.nix> # broken since 2019-04-18
{ # until virtualbox-image is fixed
diff --git a/makefu/1systems/sdev/source.nix b/makefu/1systems/sdev/source.nix
index 2e085740a..d6c3d2031 100644
--- a/makefu/1systems/sdev/source.nix
+++ b/makefu/1systems/sdev/source.nix
@@ -1,3 +1,7 @@
{
name="sdev";
+ home-manager = true;
+ hw = true;
+ mic92 = true;
+ unstable = true;
}
diff --git a/makefu/1systems/tsp/config.nix b/makefu/1systems/tsp/config.nix
index bbfaebd44..7c65737f7 100644
--- a/makefu/1systems/tsp/config.nix
+++ b/makefu/1systems/tsp/config.nix
@@ -7,6 +7,7 @@
imports =
[ # Include the results of the hardware scan.
<stockholm/makefu>
+ <stockholm/makefu/2configs/home-manager>
<stockholm/makefu/2configs/main-laptop.nix>
# <stockholm/makefu/2configs/tools/all.nix>
<stockholm/makefu/2configs/fs/single-partition-ext4.nix>
diff --git a/makefu/1systems/tsp/source.nix b/makefu/1systems/tsp/source.nix
index 9abf503e2..afb05e296 100644
--- a/makefu/1systems/tsp/source.nix
+++ b/makefu/1systems/tsp/source.nix
@@ -2,4 +2,5 @@
name="tsp";
full = true;
hw = true;
+ home-manager = true;
}
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix
index d8cf380e7..9d0c7af61 100644
--- a/makefu/1systems/wbob/config.nix
+++ b/makefu/1systems/wbob/config.nix
@@ -9,6 +9,7 @@ in {
imports =
[ # Include the results of the hardware scan.
<stockholm/makefu>
+ <stockholm/makefu/2configs/home-manager>
<stockholm/makefu/2configs/support-nixos.nix>
<stockholm/makefu/2configs/zsh-user.nix>
<stockholm/makefu/2configs/tools/core.nix>
diff --git a/makefu/1systems/wbob/source.nix b/makefu/1systems/wbob/source.nix
index c76f73760..6568b8a45 100644
--- a/makefu/1systems/wbob/source.nix
+++ b/makefu/1systems/wbob/source.nix
@@ -1,4 +1,5 @@
{
name="wbob";
# musnix = true;
+ home-manager = true;
}
diff --git a/makefu/2configs/bureautomation/multi/matrix.nix b/makefu/2configs/bureautomation/multi/matrix.nix
index 85ba31986..4fcfe8da4 100644
--- a/makefu/2configs/bureautomation/multi/matrix.nix
+++ b/makefu/2configs/bureautomation/multi/matrix.nix
@@ -52,7 +52,7 @@ in {
};
action = {
service = "notify.matrix_notify";
- data_template.message = "Temp: {{states.sensor.easy2_dht22_temperature.state_with_unit}} Hum:{{states.sensor.easy2_dht22_humidity.state_with_unit}} airquality:{{states.sensor.air_quality.state_with_unit}}";
+ data_template.message = ''Temp: {{states.sensor.notizen_temperature.state_with_unit | replace (" ","")}}, Hum:{{states.sensor.notizen_humidity.state_with_unit | replace (" ","")}}, airquality:{{states.sensor.air_quality.state_with_unit}}'';
};
}