diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-29 18:36:42 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-29 20:03:54 +0200 |
commit | 020e88704ae0a0766908fb82d7b92a6ab9901329 (patch) | |
tree | ddf70b6cbf59e98129768dd74cd6de61e2b31e1c /nixos | |
parent | c2495261a89bcb7393cf745040304c8c3679d2ce (diff) | |
download | nixlib-020e88704ae0a0766908fb82d7b92a6ab9901329.tar nixlib-020e88704ae0a0766908fb82d7b92a6ab9901329.tar.gz nixlib-020e88704ae0a0766908fb82d7b92a6ab9901329.tar.bz2 nixlib-020e88704ae0a0766908fb82d7b92a6ab9901329.tar.lz nixlib-020e88704ae0a0766908fb82d7b92a6ab9901329.tar.xz nixlib-020e88704ae0a0766908fb82d7b92a6ab9901329.tar.zst nixlib-020e88704ae0a0766908fb82d7b92a6ab9901329.zip |
kde4: Get rid of some Nepomuk cruft by default
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde4.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index 4a83b5021e04..3aa4821a0521 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -14,7 +14,7 @@ let # files), segfault sometimes and consume significant resources. # They can be re-enabled in the KDE System Settings under "Desktop # Search". - nepomukConfig = pkgs.writeTextFile + disableNepomuk = pkgs.writeTextFile { name = "nepomuk-config"; destination = "/share/config/nepomukserverrc"; text = @@ -76,6 +76,12 @@ in default = true; description = "Whether to enable PIM support. Note that enabling this pulls in Akonadi and MariaDB as dependencies."; }; + + enableNepomuk = mkOption { + type = types.bool; + default = false; + description = "Whether to enable Nepomuk (deprecated)."; + }; }; }; @@ -144,7 +150,6 @@ in pkgs.kde4.kde_wallpapers # contains kdm's default background pkgs.kde4.oxygen_icons - pkgs.virtuoso # to enable Nepomuk to find Virtuoso # Starts KDE's Polkit authentication agent. pkgs.kde4.polkit_kde_agent @@ -155,18 +160,22 @@ in xorg.xmessage # so that startkde can show error messages xorg.xset # used by startkde, non-essential xorg.xauth # used by kdesu - pkgs.shared_desktop_ontologies # used by nepomuk - pkgs.strigi # used by nepomuk ] ++ optionals cfg.enablePIM [ pkgs.kde4.kdepim_runtime pkgs.kde4.akonadi pkgs.mysql # used by akonadi ] + ++ (if cfg.enableNepomuk then + [ pkgs.shared_desktop_ontologies # used by nepomuk + pkgs.strigi # used by nepomuk + pkgs.virtuoso # to enable Nepomuk to find Virtuoso + ] else + [ disableNepomuk ]) ++ optional config.hardware.pulseaudio.enable pkgs.kde4.kmix # Perhaps this should always be enabled ++ optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil ++ optional config.networking.networkmanager.enable pkgs.kde4.plasma-nm - ++ [ nepomukConfig ] ++ phononBackendPackages; + ++ phononBackendPackages; environment.pathsToLink = [ "/share" ]; |