diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-24 11:42:32 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-24 11:50:58 +0200 |
| commit | 89e983786a4e2cf6dd238af4df6da373cc01e62b (patch) | |
| tree | 857ecb8eab59fe1855b1fb311e6e1e9ec8303bdc /nixos/modules/programs | |
| parent | e73b19ae4e984f58cebe4dd4f82cda622da552ab (diff) | |
| download | nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.tar nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.tar.gz nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.tar.bz2 nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.tar.lz nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.tar.xz nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.tar.zst nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.zip | |
Manual: Remove store path references
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, 4 insertions, 2 deletions
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index cf7ef455eb8..87a7bac208b 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -36,7 +36,6 @@ in askPassword = mkOption { type = types.str; - default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; description = ''Program used by SSH to ask for passwords.''; }; @@ -223,5 +222,7 @@ in export SSH_ASKPASS=${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 ca3188b1819..8f85b602fe2 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -99,7 +99,6 @@ 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. @@ -170,5 +169,7 @@ in startAt = cfg.dates; }; + services.venus.outputTheme = mkDefault "${pkgs.venus}/themes/classic_fancy"; + }; } |