diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-01-24 10:34:25 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-01-26 21:01:05 -0600 |
| commit | 16b54d19d3397e99aa9e2eb6442d8ca82c814b97 (patch) | |
| tree | 1bd294d2a258dbb056168e698f59f0c799781143 /nixos | |
| parent | a0b811a08ccf8deb51e35e73b79a861217ccbeee (diff) | |
| download | nixlib-16b54d19d3397e99aa9e2eb6442d8ca82c814b97.tar nixlib-16b54d19d3397e99aa9e2eb6442d8ca82c814b97.tar.gz nixlib-16b54d19d3397e99aa9e2eb6442d8ca82c814b97.tar.bz2 nixlib-16b54d19d3397e99aa9e2eb6442d8ca82c814b97.tar.lz nixlib-16b54d19d3397e99aa9e2eb6442d8ca82c814b97.tar.xz nixlib-16b54d19d3397e99aa9e2eb6442d8ca82c814b97.tar.zst nixlib-16b54d19d3397e99aa9e2eb6442d8ca82c814b97.zip | |
kde5: rename plasma5 desktop module
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/default.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix (renamed from nixos/modules/services/x11/desktop-managers/plasma5.nix) | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index b9898b734338..9165658a7be7 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -18,7 +18,7 @@ in # determines the default: later modules (if enabled) are preferred. # E.g., if KDE is enabled, it supersedes xterm. 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 ]; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index f3f88f2a0981..237c1f5a1896 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -5,7 +5,7 @@ with lib; let xcfg = config.services.xserver; - cfg = xcfg.desktopManager.plasma5; + cfg = xcfg.desktopManager.kde5; xorg = pkgs.xorg; phononBackends = { @@ -44,7 +44,7 @@ in { options = { - services.xserver.desktopManager.plasma5 = { + services.xserver.desktopManager.kde5 = { enable = mkOption { type = types.bool; default = false; @@ -69,7 +69,7 @@ in config = mkIf (xcfg.enable && cfg.enable) { services.xserver.desktopManager.session = singleton { - name = "plasma5"; + name = "kde5"; bgSupport = true; start = '' # The KDE icon cache is supposed to update itself @@ -212,10 +212,12 @@ in target = "X11/xkb"; }; - environment.profileRelativeEnvVars = mkIf (lib.elem "gstreamer" cfg.phononBackends) { - GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ]; - GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ]; - }; + environment.profileRelativeEnvVars = + mkIf (lib.elem "gstreamer" cfg.phononBackends) + { + GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ]; + GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ]; + }; fonts.fonts = [ plasma5.oxygen-fonts ]; |