diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-11 11:49:45 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-11 11:49:45 -0500 |
| commit | 61cf7e1265a4ce79d93e6f642611e71eb8753625 (patch) | |
| tree | da73943a94b7352fb1b08eaa9bd2485000f2bfee /nixos/modules/services/x11 | |
| parent | 798e613e16dd6274d301a50d6e9ee6917949050d (diff) | |
| parent | f370af91adde32dc6412976eb3aecbd9cbb284b6 (diff) | |
| download | nixlib-61cf7e1265a4ce79d93e6f642611e71eb8753625.tar nixlib-61cf7e1265a4ce79d93e6f642611e71eb8753625.tar.gz nixlib-61cf7e1265a4ce79d93e6f642611e71eb8753625.tar.bz2 nixlib-61cf7e1265a4ce79d93e6f642611e71eb8753625.tar.lz nixlib-61cf7e1265a4ce79d93e6f642611e71eb8753625.tar.xz nixlib-61cf7e1265a4ce79d93e6f642611e71eb8753625.tar.zst nixlib-61cf7e1265a4ce79d93e6f642611e71eb8753625.zip | |
Merge branch 'kde5'
Diffstat (limited to 'nixos/modules/services/x11')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 9c3c65dcfaa7..02e51577e3e2 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -88,7 +88,9 @@ in }; environment.systemPackages = - [ + filter isDerivation (builtins.attrValues plasma5) + ++ filter isDerivation (builtins.attrValues kf5) + ++ [ pkgs.qt4 # qtconfig is the only way to set Qt 4 theme kdeApps.kde-baseapps @@ -97,13 +99,12 @@ in kdeApps.konsole kdeApps.oxygen-icons + kdeApps.kde-runtime + pkgs.hicolor_icon_theme pkgs.orion # GTK theme, nearly identical to Breeze - ] - ++ filter isDerivation (builtins.attrValues plasma5) - ++ filter isDerivation (builtins.attrValues kf5) - ++ phononBackendPackages; + ] ++ phononBackendPackages; environment.pathsToLink = [ "/share" ]; @@ -121,6 +122,8 @@ in fonts.fonts = [ plasma5.oxygen-fonts ]; + programs.ssh.askPassword = "${plasma5.ksshaskpass}/bin/ksshaskpass"; + # Enable helpful DBus services. services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; |