diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-02 12:24:09 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-02 12:24:09 +0000 |
commit | ec161d2240242c215d8280b00aa82f7e3f95d64e (patch) | |
tree | 32001499525f4a7405958084db302aa141925c50 /nixos | |
parent | 6221782074b04dfe57322b0740883d35cb042615 (diff) | |
parent | 0224ebfc4cdeac3b4f6c9b813dbce5511221a74a (diff) |
Merge master into staging-next
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/config/console.nix | 3 | ||||
-rw-r--r-- | nixos/modules/programs/command-not-found/command-not-found.pl | 15 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 3 |
3 files changed, 11 insertions, 10 deletions
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index b8d52d1a8fc7..ab1667605177 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -145,7 +145,8 @@ in ''; systemd.services.systemd-vconsole-setup = - { before = [ "display-manager.service" ]; + { + before = optional config.services.xserver.enable "display-manager.service"; after = [ "systemd-udev-settle.service" ]; restartTriggers = [ vconsoleConf consoleEnv ]; }; diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl index ab7aa204653c..63c4925d4333 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.pl +++ b/nixos/modules/programs/command-not-found/command-not-found.pl @@ -27,8 +27,8 @@ if (!defined $res || scalar @$res == 0) { my $package = @$res[0]->{package}; if ($ENV{"NIX_AUTO_INSTALL"} // "") { print STDERR <<EOF; -The program ‘$program’ is currently not installed. It is provided by -the package ‘$package’, which I will now install for you. +The program '$program' is currently not installed. It is provided by +the package '$package', which I will now install for you. EOF ; exit 126 if system("nix-env", "-iA", "nixos.$package") == 0; @@ -36,16 +36,17 @@ EOF exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV)); } else { print STDERR <<EOF; -The program ‘$program’ is currently not installed. You can install it by typing: - nix-env -iA nixos.$package +The program '$program' is not in your PATH. You can make it available in a +ephemeral shell by typing: + nix-shell -p $package EOF } } else { print STDERR <<EOF; -The program ‘$program’ is currently not installed. It is provided by -several packages. You can install it by typing one of the following: +The program '$program' is not in your PATH. It is provided by several packages. +You can make it available in a ephemeral shell by typing one of the following: EOF - print STDERR " nix-env -iA nixos.$_->{package}\n" foreach @$res; + print STDERR " nix-shell -p $_->{package}\n" foreach @$res; } exit 127; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index a9b0b8dc23fb..5f1c099c283d 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -8,8 +8,7 @@ let cfg = xcfg.desktopManager.plasma5; inherit (pkgs) kdeApplications kdeFrameworks plasma5; - libsForQt5 = pkgs.libsForQt514; - qt5 = pkgs.qt514; + inherit (pkgs) qt5 libsForQt5; inherit (pkgs) writeText; pulseaudio = config.hardware.pulseaudio; |