summaryrefslogtreecommitdiffstats
path: root/tv/1systems/mu.nix
diff options
context:
space:
mode:
authornin <nineinchnade@gmail.com>2017-07-06 20:36:05 +0200
committernin <nineinchnade@gmail.com>2017-07-06 20:36:05 +0200
commitde8baa21bf122242c4ad6a4c17405259037149c8 (patch)
tree85e34f8040799313fa73a23eddb41ab5eec1d9e9 /tv/1systems/mu.nix
parent060ae725c32e6490d47bc3153de076ace26b59fd (diff)
parent438fdd2bd8e363567f544966e49d00f728921301 (diff)
Merge branch 'master' of prism:stockholm
Diffstat (limited to 'tv/1systems/mu.nix')
-rw-r--r--tv/1systems/mu.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix
index fcd0a2178..3f3b2c2f4 100644
--- a/tv/1systems/mu.nix
+++ b/tv/1systems/mu.nix
@@ -79,15 +79,12 @@ with import <stockholm/lib>;
gimp
xsane
firefoxWrapper
- chromiumDev
+ chromium
skype
libreoffice
- kde4.l10n.de
- kde4.plasma-nm
pidgin-with-plugins
pidginotr
- kde4.print_manager
#foomatic_filters
#gutenprint
#cups_pdf_filter
@@ -101,7 +98,7 @@ with import <stockholm/lib>;
security.wrappers = {
sendmail.source = "${pkgs.exim}/bin/sendmail"; # for cron
- slock.slock = "${pkgs.slock}/bin/slock";
+ slock.source = "${pkgs.slock}/bin/slock";
};
security.pam.loginLimits = [
@@ -138,7 +135,9 @@ with import <stockholm/lib>;
twoFingerScroll = true;
};
- services.xserver.desktopManager.kde4.enable = true;
+ services.xserver.desktopManager.plasma5 = {
+ enable = true;
+ };
services.xserver.displayManager.auto = {
enable = true;
user = "vv";