diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 10:07:27 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 10:07:27 +0100 |
| commit | b2a37ceeea8c38ec71447f8dae1e6890a8cf982d (patch) | |
| tree | f2909e978dcfdd88e7aff68899719d8b8891f6dc /nixos/modules/programs | |
| parent | 7fa9a1abce623aaf18b22f5dca3fc8a44a494e8d (diff) | |
| parent | 3bcf8ae8795ede9909df07fb97e049442b38c231 (diff) | |
| download | nixlib-b2a37ceeea8c38ec71447f8dae1e6890a8cf982d.tar nixlib-b2a37ceeea8c38ec71447f8dae1e6890a8cf982d.tar.gz nixlib-b2a37ceeea8c38ec71447f8dae1e6890a8cf982d.tar.bz2 nixlib-b2a37ceeea8c38ec71447f8dae1e6890a8cf982d.tar.lz nixlib-b2a37ceeea8c38ec71447f8dae1e6890a8cf982d.tar.xz nixlib-b2a37ceeea8c38ec71447f8dae1e6890a8cf982d.tar.zst nixlib-b2a37ceeea8c38ec71447f8dae1e6890a8cf982d.zip | |
Merge #12357: nixos docs: show references to packages
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 169c6a38e75b..1ad45f468030 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 c3756b4838c7..5c322c5589fc 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. @@ -169,7 +170,5 @@ in startAt = cfg.dates; }; - services.venus.outputTheme = mkDefault "${pkgs.venus}/themes/classic_fancy"; - }; } |