ghoscht/arion
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename nixos.useInit -> nixos.useSystemd

Browse source
This commit is contained in:
Robert Hensing 2019-03-06 12:49:39 +01:00
parent a5e08b23a3
commit 97d58f7bd3
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/full-nixos/arion-compose.nix
View file

@ -1,6 +1,6 @@
{
docker-compose.services.webserver = { pkgs, ... }: {
nixos.useInit = true;
nixos.useSystemd = true;
nixos.configuration.services.nginx.enable = true;
nixos.configuration.services.nginx.virtualHosts.localhost.root = "${pkgs.nix.doc}/share/doc/nix/manual";
service.useHostStore = true;

6
src/nix/modules/service/nixos-init.nix
View file

@ -7,18 +7,18 @@ let
in
{
options = {
nixos.useInit = lib.mkOption {
nixos.useSystemd = lib.mkOption {
type = types.bool;
default = false;
description = ''
When enabled, call the NixOS init system.
When enabled, call the NixOS systemd-based init system.
Configure NixOS with <code>nixos.configuration</code>.
'';
};
};
config = lib.mkIf (config.nixos.useInit) {
config = lib.mkIf (config.nixos.useSystemd) {
nixos.configuration.imports = [
../nixos/container-systemd.nix
(pkgs.path + "/nixos/modules/profiles/minimal.nix")

6
src/nix/modules/service/nixos.nix
View file

@ -18,7 +18,7 @@ in
This option is unused by default, because not all images use NixOS.
One way to use this is to enable <code>nixos.useInit</code>, but the
One way to use this is to enable <code>nixos.useSystemd</code>, but the
NixOS configuration can be used in other ways.
'';
};
@ -31,7 +31,7 @@ in
This option is unused by default, because not all images use NixOS.
One way to use this is to enable <code>nixos.useInit</code>, but the
One way to use this is to enable <code>nixos.useSystemd</code>, but the
NixOS configuration can be used in other ways.
'';
};
@ -44,7 +44,7 @@ in
This option is unused by default, because not all images use NixOS.
One way to use this is to enable <code>nixos.useInit</code>, but the
One way to use this is to enable <code>nixos.useSystemd</code>, but the
NixOS configuration can be used in other ways.
'';
};