summary refs log tree commit diff
path: root/nixos/modules/config/gnu.nix
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-08-23 15:32:41 +0000
committerRobin Gloster <mail@glob.in>2016-08-23 15:32:41 +0000
commit7413278f9bda2665eb487c44aa243572cc018df3 (patch)
treece603107afd0d5f879ca864c393a2b47ec199fb6 /nixos/modules/config/gnu.nix
parent3a18f06eab4061b11f8a83cadd908fe39d308c33 (diff)
downloadnixpkgs-7413278f9bda2665eb487c44aa243572cc018df3.tar
nixpkgs-7413278f9bda2665eb487c44aa243572cc018df3.tar.gz
nixpkgs-7413278f9bda2665eb487c44aa243572cc018df3.tar.bz2
nixpkgs-7413278f9bda2665eb487c44aa243572cc018df3.tar.lz
nixpkgs-7413278f9bda2665eb487c44aa243572cc018df3.tar.xz
nixpkgs-7413278f9bda2665eb487c44aa243572cc018df3.tar.zst
nixpkgs-7413278f9bda2665eb487c44aa243572cc018df3.zip
Revert "Remove lsh, broken & unmaintained"
This reverts commit 73f4c2bdf89ca02d70e614631531af307d056fef.
Diffstat (limited to 'nixos/modules/config/gnu.nix')
-rw-r--r--nixos/modules/config/gnu.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix
index 5cc41ce8690..f8c35b440d1 100644
--- a/nixos/modules/config/gnu.nix
+++ b/nixos/modules/config/gnu.nix
@@ -9,7 +9,8 @@ with lib;
       default = false;
       description =
         '' When enabled, GNU software is chosen by default whenever a there is
-           a choice between GNU and non-GNU software.
+           a choice between GNU and non-GNU software (e.g., GNU lsh
+           vs. OpenSSH).
         '';
     };
   };
@@ -32,6 +33,12 @@ with lib;
     boot.loader.grub.enable = !pkgs.stdenv.isArm;
     boot.loader.grub.version = 2;
 
+    # GNU lsh.
+    services.openssh.enable = false;
+    services.lshd.enable = true;
+    programs.ssh.startAgent = false;
+    services.xserver.startGnuPGAgent = true;
+
     # TODO: GNU dico.
     # TODO: GNU Inetutils' inetd.
     # TODO: GNU Pies.