summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2023-01-11 15:15:54 +0100
committermakefu <github@syntax-fehler.de>2023-01-11 15:15:54 +0100
commitad1c58e7e1153a5a3ed4f809a1dd5c37d9bb91af (patch)
tree03aaeacdc4dce839a5c51d4a619bf78160655894 /makefu
parentc691e94c45e6c5bdac531186374b185ea1790311 (diff)
parent902ee85b6726a1e7d76783d097231d063c7a5ea8 (diff)
Merge remote-tracking branch 'thierry/master'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/wbob/config.nix1
-rw-r--r--makefu/2configs/bureautomation/default.nix1
-rw-r--r--makefu/2configs/default.nix2
3 files changed, 3 insertions, 1 deletions
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix
index d4d0f4b69..5cf5eb5c8 100644
--- a/makefu/1systems/wbob/config.nix
+++ b/makefu/1systems/wbob/config.nix
@@ -22,6 +22,7 @@ in {
# <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
<stockholm/makefu/2configs/tinc/retiolum.nix>
<stockholm/makefu/2configs/gui/wbob-kiosk.nix>
+ { environment.systemPackages = [ pkgs.kodi pkgs.nano ]; }
# <stockholm/makefu/2configs/gui/studio-virtual.nix>
# <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
diff --git a/makefu/2configs/bureautomation/default.nix b/makefu/2configs/bureautomation/default.nix
index 44690271d..a3af30d2f 100644
--- a/makefu/2configs/bureautomation/default.nix
+++ b/makefu/2configs/bureautomation/default.nix
@@ -64,6 +64,7 @@ in {
extraOptions = ["--net=host" ];
volumes = [
"${confdir}:/config"
+ "/data/music:/config/media"
#"${confdir}/docker-run:/etc/services.d/home-assistant/run:"
];
};
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 9a08a4497..ef4f8fbcd 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -68,7 +68,7 @@ with import <stockholm/lib>;
};
nixpkgs.config.packageOverrides = pkgs: {
- nano = pkgs.runCommand "empty" {} "mkdir -p $out";
+ #nano = pkgs.runCommand "empty" {} "mkdir -p $out";
tinc = pkgs.tinc_pre;
};