dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

kde5: rename plasma5 desktop module

Browse Source
This commit is contained in:
Thomas Tuegel 2015-01-24 10:34:25 -06:00
parent a0b811a08c
commit 16b54d19d3
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/default.nix
View File

@ -18,7 +18,7 @@ in
# determines the default: later modules (if enabled) are preferred. # determines the default: later modules (if enabled) are preferred.
# E.g., if KDE is enabled, it supersedes xterm. # E.g., if KDE is enabled, it supersedes xterm.
imports = [ imports = [
./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./plasma5.nix ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix
./e19.nix ./gnome3.nix ./xbmc.nix ./kodi.nix ./e19.nix ./gnome3.nix ./xbmc.nix ./kodi.nix
]; ];

16
nixos/modules/services/x11/desktop-managers/plasma5.nix → nixos/modules/services/x11/desktop-managers/kde5.nix
View File

@ -5,7 +5,7 @@ with lib;
let let
xcfg = config.services.xserver; xcfg = config.services.xserver;
cfg = xcfg.desktopManager.plasma5; cfg = xcfg.desktopManager.kde5;
xorg = pkgs.xorg; xorg = pkgs.xorg;
phononBackends = { phononBackends = {
@ -44,7 +44,7 @@ in
{ {
options = { options = {
services.xserver.desktopManager.plasma5 = { services.xserver.desktopManager.kde5 = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -69,7 +69,7 @@ in
config = mkIf (xcfg.enable && cfg.enable) { config = mkIf (xcfg.enable && cfg.enable) {
services.xserver.desktopManager.session = singleton { services.xserver.desktopManager.session = singleton {
name = "plasma5"; name = "kde5";
bgSupport = true; bgSupport = true;
start = '' start = ''
# The KDE icon cache is supposed to update itself # The KDE icon cache is supposed to update itself
@ -212,10 +212,12 @@ in
target = "X11/xkb"; target = "X11/xkb";
}; };
environment.profileRelativeEnvVars = mkIf (lib.elem "gstreamer" cfg.phononBackends) { environment.profileRelativeEnvVars =
GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ]; mkIf (lib.elem "gstreamer" cfg.phononBackends)
GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ]; {
}; GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
};
fonts.fonts = [ plasma5.oxygen-fonts ]; fonts.fonts = [ plasma5.oxygen-fonts ];