Merge remote-tracking branch 'thierry/master'
This commit is contained in:
commit
ad1c58e7e1
@ -22,6 +22,7 @@ in {
|
|||||||
# <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
|
# <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
|
||||||
<stockholm/makefu/2configs/tinc/retiolum.nix>
|
<stockholm/makefu/2configs/tinc/retiolum.nix>
|
||||||
<stockholm/makefu/2configs/gui/wbob-kiosk.nix>
|
<stockholm/makefu/2configs/gui/wbob-kiosk.nix>
|
||||||
|
{ environment.systemPackages = [ pkgs.kodi pkgs.nano ]; }
|
||||||
|
|
||||||
# <stockholm/makefu/2configs/gui/studio-virtual.nix>
|
# <stockholm/makefu/2configs/gui/studio-virtual.nix>
|
||||||
# <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
|
# <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
|
||||||
|
@ -64,6 +64,7 @@ in {
|
|||||||
extraOptions = ["--net=host" ];
|
extraOptions = ["--net=host" ];
|
||||||
volumes = [
|
volumes = [
|
||||||
"${confdir}:/config"
|
"${confdir}:/config"
|
||||||
|
"/data/music:/config/media"
|
||||||
#"${confdir}/docker-run:/etc/services.d/home-assistant/run:"
|
#"${confdir}/docker-run:/etc/services.d/home-assistant/run:"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -68,7 +68,7 @@ with import <stockholm/lib>;
|
|||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
nixpkgs.config.packageOverrides = pkgs: {
|
||||||
nano = pkgs.runCommand "empty" {} "mkdir -p $out";
|
#nano = pkgs.runCommand "empty" {} "mkdir -p $out";
|
||||||
tinc = pkgs.tinc_pre;
|
tinc = pkgs.tinc_pre;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user