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 | b4c5c19112f16d6d71455be0c4b9b946b4909c30 (patch) | |
| tree | f0d5846763d84d83b2cf3ee372c10c9e4f2a6321 /tv/1systems/mu | |
| parent | 8bb0e8442e377cb1152959d5de4f61cb135cc31a (diff) | |
| parent | 94c1cf62732f26944b5bb613c4880011f68420a3 (diff) | |
Merge remote-tracking branch 'ni/master' 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 f513665..c26d4ab 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"; |