Merge remote-tracking branch 'thierry/master'

This commit is contained in:
makefu 2023-01-11 15:15:54 +01:00
commit ad1c58e7e1
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
3 changed files with 3 additions and 1 deletions

View File

@ -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>

View File

@ -64,6 +64,7 @@ in {
extraOptions = ["--net=host" ];
volumes = [
"${confdir}:/config"
"/data/music:/config/media"
#"${confdir}/docker-run:/etc/services.d/home-assistant/run:"
];
};

View File

@ -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;
};