Skip to content

Commit 9241db6

Browse files
committed
smaller cleanups
1 parent 0121e77 commit 9241db6

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

share/modules/nixos-shell-config.nix

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,12 @@ in {
5151
# FIXME? currently 500K seems to be the limit?
5252
virtualisation.msize = mkVMDefault 104857600;
5353

54-
services =
55-
let
56-
service = if lib.versionAtLeast (lib.versions.majorMinor lib.version) "20.09" then "getty" else "mingetty";
57-
in
58-
{
59-
${service}.helpLine = ''
60-
Log in as "root" with an empty password.
61-
If you are connect via serial console:
62-
Type Ctrl-a c to switch to the qemu console
63-
and `quit` to stop the VM.
64-
'';
65-
};
54+
services.getty.helpLine = ''
55+
If you are connect via serial console:
56+
Type Ctrl-a c to switch to the qemu console
57+
and `quit` to stop the VM.
58+
'';
59+
services.getty.autologinUser = "root";
6660

6761
virtualisation = {
6862
graphics = mkVMDefault false;

share/modules/nixos-shell.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ lib, options, pkgs, modulesPath, ... }:
1+
{ lib, modulesPath, ... }:
22

33
{
44
imports = [
@@ -16,7 +16,7 @@
1616
mountHome = mkOption {
1717
type = types.bool;
1818
default = true;
19-
description = "Whether to mount <filename>/home</filename>.";
19+
description = "Whether to mount `/home`.";
2020
};
2121

2222
mountNixProfile = mkOption {
@@ -36,7 +36,7 @@
3636
options = {
3737
target = mkOption {
3838
type = types.path;
39-
description = "Target on the guest.";
39+
description = lib.mdDoc "Target on the guest.";
4040
};
4141

4242
inherit cache;

0 commit comments

Comments
 (0)