public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/plasma5: Rename Plasma 5 desktop 

- There is no such thing as KDE 5
This commit is contained in:
Thomas Tuegel 2017-02-25 14:43:13 -06:00
parent 8be4bd7416
commit f21d4d0015
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/rename.nix
View File

@ -178,6 +178,9 @@ with lib;
(mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ]) (mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ])
(mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ]) (mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ])
# KDE Plasma 5
(mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])
# Options that are obsolete and have no replacement. # Options that are obsolete and have no replacement.
(mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
(mkRemovedOptionModule [ "programs" "bash" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")

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

@ -16,9 +16,9 @@ in
{ {
# Note: the order in which desktop manager modules are imported here # Note: the order in which desktop manager modules are imported here
# 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 Plasma 5 is enabled, it supersedes xterm.
imports = [ imports = [
./none.nix ./xterm.nix ./xfce.nix ./kde5.nix ./lumina.nix ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
]; ];

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

@ -5,16 +5,16 @@ with lib;
let let
xcfg = config.services.xserver; xcfg = config.services.xserver;
cfg = xcfg.desktopManager.kde5; cfg = xcfg.desktopManager.plasma5;
inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg; inherit (pkgs) kdeWrapper kdeApplications plasma5 libsForQt5 qt5 xorg;
in in
{ {
options = { options = {
services.xserver.desktopManager.kde5 = { services.xserver.desktopManager.plasma5 = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -45,12 +45,12 @@ in
config = mkMerge [ config = mkMerge [
(mkIf (cfg.extraPackages != []) { (mkIf (cfg.extraPackages != []) {
environment.systemPackages = [ (libsForQt5.kdeWrapper cfg.extraPackages) ]; environment.systemPackages = [ (kdeWrapper cfg.extraPackages) ];
}) })
(mkIf (xcfg.enable && cfg.enable) { (mkIf (xcfg.enable && cfg.enable) {
services.xserver.desktopManager.session = singleton { services.xserver.desktopManager.session = singleton {
name = "Plasma 5"; name = "plasma5";
bgSupport = true; bgSupport = true;
start = '' start = ''
# Load PulseAudio module for routing support. # Load PulseAudio module for routing support.
@ -163,7 +163,7 @@ in
++ lib.optional config.services.colord.enable colord-kde ++ lib.optional config.services.colord.enable colord-kde
++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]; ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ];
services.xserver.desktopManager.kde5.extraPackages = services.xserver.desktopManager.plasma5.extraPackages =
with kdeApplications; with plasma5; with kdeApplications; with plasma5;
[ [
khelpcenter khelpcenter