summaryrefslogtreecommitdiffstats
path: root/tv/1systems/querel/config.nix
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-10-07 11:41:44 +0200
committerlassulus <lass@blue.r>2018-10-07 11:41:44 +0200
commitee07881154f247d792e9121f3eb1c1b1275cd938 (patch)
treef048764fe696907d23c680cff44b695fccb27fb8 /tv/1systems/querel/config.nix
parentea82a695cf7895bd607cec4b5b80f3f90e736ce1 (diff)
parent5641a6ad03baccf299be6574193a37dd16e17137 (diff)
Merge remote-tracking branch 'ni/master' into 18.09
Diffstat (limited to 'tv/1systems/querel/config.nix')
-rw-r--r--tv/1systems/querel/config.nix10
1 files changed, 3 insertions, 7 deletions
diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix
index 5f981c64c..01d67b5f5 100644
--- a/tv/1systems/querel/config.nix
+++ b/tv/1systems/querel/config.nix
@@ -2,10 +2,9 @@ with import <stockholm/lib>;
{ config, pkgs, ... }: {
imports = [
- <stockholm/krebs>
- <stockholm/tv/2configs>
- <stockholm/tv/3modules>
+ <stockholm/tv>
<stockholm/tv/2configs/retiolum.nix>
+ <stockholm/tv/2configs/xp-332.nix>
];
krebs.build.host = config.krebs.hosts.querel;
@@ -37,6 +36,7 @@ with import <stockholm/lib>;
sxiv
texlive.combined.scheme-full
vim
+ xsane
zathura
];
@@ -67,10 +67,6 @@ with import <stockholm/lib>;
programs.ssh.startAgent = false;
- services.printing = {
- enable = true;
- };
-
services.xserver.enable = true;
services.xserver.layout = "de";
services.xserver.xkbOptions = "eurosign:e";