summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-06-27 22:14:54 +0200
committerlassulus <lass@lassul.us>2017-06-27 22:14:54 +0200
commit19aa115948e518be67ac74dd7eea892831ce798f (patch)
tree14924b0c9a075225da3ace6d110796c7643a9a3e
parent80fb1556ddafc1bc359c2003d2565b2d774ce4f1 (diff)
parent24adece79e47af6602ce1fc48a2d5b772c225b61 (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--tv/1systems/mu.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix
index fcd0a2178..8e527b021 100644
--- a/tv/1systems/mu.nix
+++ b/tv/1systems/mu.nix
@@ -82,12 +82,9 @@ with import <stockholm/lib>;
chromiumDev
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";