diff options
author | makefu <github@syntax-fehler.de> | 2018-10-07 23:12:16 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2018-10-07 23:12:16 +0200 |
commit | 91023a11ebae6794caaecc882892da7f90deea28 (patch) | |
tree | 5bfd29cf49b1248cff80c4e001b0bf78b972ff26 /tv/1systems/mu | |
parent | 9104af869e8c8ce299fc2ddbf7f2631bbbf48b1e (diff) | |
parent | 6b08d5aa46adc80d8a1ab4ed1d3e320c61a19f01 (diff) |
Merge remote-tracking branch 'lass/18.09' into 18.09
Diffstat (limited to 'tv/1systems/mu')
-rw-r--r-- | tv/1systems/mu/config.nix | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index f51366546..c26d4ab30 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -3,6 +3,7 @@ with import <stockholm/lib>; imports = [ <stockholm/tv> + <stockholm/tv/2configs/br.nix> <stockholm/tv/2configs/exim-retiolum.nix> <stockholm/tv/2configs/retiolum.nix> ]; @@ -90,20 +91,6 @@ with import <stockholm/lib>; pkgs.xlibs.fontschumachermisc ]; - # Enable CUPS to print documents. - services.printing = { - enable = true; - #drivers = [ - # #pkgs.foomatic_filters - # #pkgs.gutenprint - # #pkgs.cups_pdf_filter - # #pkgs.ghostscript - #]; - #cupsdConf = '' - # LogLevel debug2 - #''; - }; - services.xserver.enable = true; services.xserver.layout = "de"; services.xserver.xkbOptions = "eurosign:e"; |