summaryrefslogtreecommitdiffstats
path: root/2configs
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
commitbd10e4cf76acfce6d3bbe9ed0464454eb33b1fe3 (patch)
tree5721a19f04ce54d847080297ca006f321ff77242 /2configs
parentaeab26b333c52a21eb540c13796cae56d47eb224 (diff)
parent458b506217c19fe1c8b08008ec17b1f9d4ec7f65 (diff)
Merge remote-tracking branch 'thierry/master'
Diffstat (limited to '2configs')
-rw-r--r--2configs/bureautomation/default.nix1
-rw-r--r--2configs/default.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/2configs/bureautomation/default.nix b/2configs/bureautomation/default.nix
index 44690271d..a3af30d2f 100644
--- a/2configs/bureautomation/default.nix
+++ b/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/2configs/default.nix b/2configs/default.nix
index 9a08a4497..ef4f8fbcd 100644
--- a/2configs/default.nix
+++ b/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;
};
[cgit] Unable to lock slot /tmp/cgit/3b100000.lock: No such file or directory (2)