Skip to content

Commit 740d763

Browse files
FRidhFRidh
committedJul 31, 2017
Merge commit 'ba68231273bea4cba01413fd2a0e56d68db9234c' into HEAD
·
branch-off-24.1117.09-beta
2 parents 2a48a62 + ba68231 commit 740d763

File tree

132 files changed

+1448
-1286
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+1448
-1286
lines changed
 

‎nixos/modules/services/ttys/agetty.nix

+9-4
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,19 @@ in
6868
services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixosLabel} (\m) - \l >>>'';
6969

7070
systemd.services."getty@" =
71-
{ serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM";
71+
{ serviceConfig.ExecStart = [
72+
"" # override upstream default with an empty ExecStart
73+
(gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM")
74+
];
7275
restartIfChanged = false;
7376
};
7477

7578
systemd.services."serial-getty@" =
76-
{ serviceConfig.ExecStart =
77-
let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed);
78-
in gettyCmd "%I ${speeds} $TERM";
79+
let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed); in
80+
{ serviceConfig.ExecStart = [
81+
"" # override upstream default with an empty ExecStart
82+
(gettyCmd "%I ${speeds} $TERM")
83+
];
7984
restartIfChanged = false;
8085
};
8186

‎nixos/tests/keymap.nix

+32
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,38 @@ let
4949
machine.i18n.consoleKeyMap = mkOverride 900 layout;
5050
machine.services.xserver.layout = mkOverride 900 layout;
5151
machine.imports = [ ./common/x11.nix extraConfig ];
52+
machine.services.xserver.displayManager.slim = {
53+
enable = true;
54+
55+
# Use a custom theme in order to get best OCR results
56+
theme = pkgs.runCommand "slim-theme-ocr" {
57+
nativeBuildInputs = [ pkgs.imagemagick ];
58+
} ''
59+
mkdir "$out"
60+
convert -size 1x1 xc:white "$out/background.jpg"
61+
convert -size 200x100 xc:white "$out/panel.jpg"
62+
cat > "$out/slim.theme" <<EOF
63+
background_color #ffffff
64+
background_style tile
65+
66+
input_fgcolor #000000
67+
msg_color #000000
68+
69+
session_color #000000
70+
session_font Verdana:size=16:bold
71+
72+
username_msg Username:
73+
username_font Verdana:size=16:bold
74+
username_color #000000
75+
username_x 50%
76+
username_y 40%
77+
78+
password_msg Password:
79+
password_x 50%
80+
password_y 40%
81+
EOF
82+
'';
83+
};
5284

5385
testScript = ''
5486
sub waitCatAndDelete ($) {

0 commit comments

Comments
 (0)
Please sign in to comment.