diff options
author | lassulus <lass@blue.r> | 2018-10-07 11:41:44 +0200 |
---|---|---|
committer | lassulus <lass@blue.r> | 2018-10-07 11:41:44 +0200 |
commit | ee07881154f247d792e9121f3eb1c1b1275cd938 (patch) | |
tree | f048764fe696907d23c680cff44b695fccb27fb8 /tv/1systems/mu/config.nix | |
parent | ea82a695cf7895bd607cec4b5b80f3f90e736ce1 (diff) | |
parent | 5641a6ad03baccf299be6574193a37dd16e17137 (diff) |
Merge remote-tracking branch 'ni/master' into 18.09
Diffstat (limited to 'tv/1systems/mu/config.nix')
-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"; |