diff options
author | makefu <github@syntax-fehler.de> | 2017-06-28 08:47:23 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2017-06-28 08:47:23 +0200 |
commit | 74bbb2c0b11691368604c1d8c0e2fb547b47dd47 (patch) | |
tree | 1e4f00951b6278df919a3e45158b0c844f5f4cd0 /tv/1systems/mu.nix | |
parent | 9bd7f9ebf4055534ace98002a1a9ddbb243805d1 (diff) | |
parent | 4986344d6e2674914caa31cb4a4bd198dd3d50a0 (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/1systems/mu.nix')
-rw-r--r-- | tv/1systems/mu.nix | 11 |
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"; |