diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-16 10:56:41 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:43:39 -0500 |
| commit | be7b7d908f82e8ab16c43ffd0e240addd6f4018a (patch) | |
| tree | 81d875bcec94de6d94ce20725393d9c35f1c165a /nixos | |
| parent | 945758f96030ee7762ccdab32a3ffddd028b37b6 (diff) | |
| download | nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.gz nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.bz2 nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.lz nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.xz nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.zst nixlib-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.zip | |
Remove kdeWrapper
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index d981cd5328e1..27678fda1b50 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -7,7 +7,7 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager.plasma5; - inherit (pkgs) kdeWrapper kdeApplications plasma5 libsForQt5 qt5 xorg; + inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg; in @@ -30,24 +30,12 @@ in ''; }; - extraPackages = mkOption { - type = types.listOf types.package; - default = []; - description = '' - KDE packages that need to be installed system-wide. - ''; - }; - }; }; config = mkMerge [ - (mkIf (cfg.extraPackages != []) { - environment.systemPackages = [ (kdeWrapper cfg.extraPackages) ]; - }) - (mkIf (xcfg.enable && cfg.enable) { services.xserver.desktopManager.session = singleton { name = "plasma5"; @@ -139,10 +127,14 @@ in plasma-workspace plasma-workspace-wallpapers + dolphin dolphin-plugins ffmpegthumbs kdegraphics-thumbnailers + khelpcenter kio-extras + konsole + oxygen print-manager breeze-icons @@ -163,16 +155,6 @@ in ++ lib.optional config.services.colord.enable colord-kde ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]; - services.xserver.desktopManager.plasma5.extraPackages = - with kdeApplications; with plasma5; - [ - khelpcenter - oxygen - - dolphin - konsole - ]; - environment.pathsToLink = [ "/share" ]; environment.etc = singleton { |