diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-27 10:48:12 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-27 10:48:12 +0100 |
| commit | 3cf9cd8bc30c5e271822adaeb5069b19879acc8c (patch) | |
| tree | ce9fe94c3ed47c78ac741fb35f572aa6bcece2a8 /nixos/modules/programs | |
| parent | a8b44c74d351a60c7b6c7e30d8b62b85aaa00f94 (diff) | |
| parent | 4fede53c0996938979d2966a69f108782a8c1c12 (diff) | |
| download | nixpkgs-3cf9cd8bc30c5e271822adaeb5069b19879acc8c.tar nixpkgs-3cf9cd8bc30c5e271822adaeb5069b19879acc8c.tar.gz nixpkgs-3cf9cd8bc30c5e271822adaeb5069b19879acc8c.tar.bz2 nixpkgs-3cf9cd8bc30c5e271822adaeb5069b19879acc8c.tar.lz nixpkgs-3cf9cd8bc30c5e271822adaeb5069b19879acc8c.tar.xz nixpkgs-3cf9cd8bc30c5e271822adaeb5069b19879acc8c.tar.zst nixpkgs-3cf9cd8bc30c5e271822adaeb5069b19879acc8c.zip | |
Merge #12796: nixos docs: show references to packages
(version 2) A better implementation of #10039, after #12357. This time I did more thorough checking. See commit messages for details.
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/ssh.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/programs/venus.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 169c6a38e75..1ad45f46803 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -36,6 +36,7 @@ in askPassword = mkOption { type = types.str; + default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; description = ''Program used by SSH to ask for passwords.''; }; @@ -226,7 +227,5 @@ in environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword; - programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; - }; } diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix index 76827eeced6..731ebed14c7 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -99,6 +99,7 @@ in }; outputTheme = mkOption { + default = "${pkgs.venus}/themes/classic_fancy"; type = types.path; description = '' Directory containing a config.ini file which is merged with this one. @@ -168,7 +169,5 @@ in startAt = cfg.dates; }; - services.venus.outputTheme = mkDefault "${pkgs.venus}/themes/classic_fancy"; - }; } |