Merge pull request #127927 from primeos/nixos-sway-defaults

This commit is contained in:
Martin Weinelt 2021-06-23 18:23:12 +02:00 committed by GitHub
commit 25351c1ec0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions

View file

@ -341,6 +341,17 @@
attempts from the SSH logs.
</para>
</listitem>
<listitem>
<para>
Sway: The terminal emulator <literal>rxvt-unicode</literal> is
no longer installed by default via
<literal>programs.sway.extraPackages</literal>. The current
default configuration uses <literal>alacritty</literal> (and
soon <literal>foot</literal>) so this is only an issue when
using a customized configuration and not installing
<literal>rxvt-unicode</literal> explicitly.
</para>
</listitem>
</itemizedlist>
</section>
</section>

View file

@ -83,3 +83,5 @@ In addition to numerous new and upgraded packages, this release has the followin
- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.
However, if [`services.fail2ban.enable`](options.html#opt-services.fail2ban.enable) is `true`, the `fail2ban` will override the verbosity to `"VERBOSE"`, so that `fail2ban` can observe the failed login attempts from the SSH logs.
- Sway: The terminal emulator `rxvt-unicode` is no longer installed by default via `programs.sway.extraPackages`. The current default configuration uses `alacritty` (and soon `foot`) so this is only an issue when using a customized configuration and not installing `rxvt-unicode` explicitly.

View file

@ -91,10 +91,9 @@ in {
type = with types; listOf package;
default = with pkgs; [
swaylock swayidle alacritty dmenu
rxvt-unicode # For backward compatibility (old default terminal)
];
defaultText = literalExample ''
with pkgs; [ swaylock swayidle rxvt-unicode alacritty dmenu ];
with pkgs; [ swaylock swayidle alacritty dmenu ];
'';
example = literalExample ''
with pkgs; [