diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-18 16:12:36 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-18 16:21:26 +0200 |
commit | ec4f38c56f0a7dfc9b2f9db111250f925e009c7d (patch) | |
tree | 5f630b316479985d695395f606624feb7d2be011 | |
parent | 72c2898e74fd868c5cb4f3cbada8ba5701e3a6ae (diff) | |
download | nixpkgs-ec4f38c56f0a7dfc9b2f9db111250f925e009c7d.tar nixpkgs-ec4f38c56f0a7dfc9b2f9db111250f925e009c7d.tar.gz nixpkgs-ec4f38c56f0a7dfc9b2f9db111250f925e009c7d.tar.bz2 nixpkgs-ec4f38c56f0a7dfc9b2f9db111250f925e009c7d.tar.lz nixpkgs-ec4f38c56f0a7dfc9b2f9db111250f925e009c7d.tar.xz nixpkgs-ec4f38c56f0a7dfc9b2f9db111250f925e009c7d.tar.zst nixpkgs-ec4f38c56f0a7dfc9b2f9db111250f925e009c7d.zip |
Manual: Remove some option defaults that refer to store paths
Option defaults should not refer to store paths, because they cause the manual to be rebuilt gratuitously. It's especially bad to refer to a highly variable path like a computed configuration file.
-rw-r--r-- | nixos/modules/config/pulseaudio.nix | 5 | ||||
-rw-r--r-- | nixos/modules/services/hardware/pommed.nix | 38 | ||||
-rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 7 |
3 files changed, 30 insertions, 20 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index fb5715022b7..297b3a82d6c 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -71,8 +71,7 @@ in { }; configFile = mkOption { - type = types.uniq types.path; - default = "${cfg.package}/etc/pulse/default.pa"; + type = types.path; description = '' The path to the configuration the PulseAudio server should use. By default, the "default.pa" configuration @@ -112,6 +111,8 @@ in { target = "pulse/client.conf"; source = clientConf; }; + + hardware.pulseaudio.configFile = mkDefault "${cfg.package}/etc/pulse/default.pa"; } (mkIf cfg.enable { diff --git a/nixos/modules/services/hardware/pommed.nix b/nixos/modules/services/hardware/pommed.nix index 04db46999b0..a24557b40ba 100644 --- a/nixos/modules/services/hardware/pommed.nix +++ b/nixos/modules/services/hardware/pommed.nix @@ -4,30 +4,34 @@ with lib; { - options.services.hardware.pommed = { - enable = mkOption { - default = false; - description = '' - Whether to use the pommed tool to handle Apple laptop keyboard hotkeys. - ''; + options = { + + services.hardware.pommed = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to use the pommed tool to handle Apple laptop keyboard hotkeys. + ''; + }; + + configFile = mkOption { + type = types.path; + description = '' + The path to the <filename>pommed.conf</filename> file. + ''; + }; }; - configFile = mkOption { - default = "${pkgs.pommed}/etc/pommed.conf"; - description = '' - The contents of the pommed.conf file. - ''; - }; }; config = mkIf config.services.hardware.pommed.enable { environment.systemPackages = [ pkgs.polkit ]; - environment.etc = [ - { source = config.services.hardware.pommed.configFile; - target = "pommed.conf"; - } - ]; + environment.etc."pommed.conf".source = config.services.hardware.pommed.configFile; + + services.hardware.pommed.configFile = "${pkgs.pommed}/etc/pommed.conf"; services.dbus.packages = [ pkgs.pommed ]; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 6e61576f501..004ea6ef49a 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -169,7 +169,6 @@ in xserverBin = mkOption { type = types.path; - default = "${xorg.xorgserver}/bin/X"; description = "Path to the X server used by display managers."; }; @@ -280,4 +279,10 @@ in }; + config = { + + services.xserver.displayManager.xserverBin = "${xorg.xorgserver}/bin/X"; + + }; + } |