summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-07-16 16:28:30 -0400
committerGitHub <noreply@github.com>2017-07-16 16:28:30 -0400
commit6b879ef36ea55958e2b6f621881d2ef05148cb46 (patch)
treee2eddc4483b063c507e655067c1b7f3459914af4 /nixos
parentb6188438607bbb817d17db31b061870379a8faf6 (diff)
parentc2b0cb5db6c9df000060501ca2dd5293694da216 (diff)
Merge pull request #23964 from benley/nixos-manual-launcher
nixos: nix snowflake logo for the nixos manual launcher
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/misc/nixos-manual.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 622607f3b32d..515864ec2e2d 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -62,8 +62,7 @@ let
name = "nixos-manual";
desktopName = "NixOS Manual";
genericName = "View NixOS documentation in a web browser";
- # TODO: find a better icon (Nix logo + help overlay?)
- icon = "system-help";
+ icon = "nix-snowflake";
exec = "${helpScript}/bin/nixos-help";
categories = "System";
};
@@ -115,7 +114,7 @@ in
environment.systemPackages =
[ manual.manual helpScript ]
- ++ optional config.services.xserver.enable desktopItem
+ ++ optionals config.services.xserver.enable [desktopItem pkgs.nixos-icons]
++ optional config.programs.man.enable manual.manpages;
boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"];