diff options
| author | makefu <github@syntax-fehler.de> | 2016-06-02 11:17:18 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-06-02 11:17:18 +0200 |
| commit | 4f28d9a306c2989304b52889c07e22992e40da0b (patch) | |
| tree | d07166696ed3bd97bb6a165418af8611b8f68571 /lass/1systems/mors.nix | |
| parent | d5961aa09e399bb30f940eb5ac2cfe26dfa51d65 (diff) | |
| parent | 7bd85d7bbbce68ba7317e16b805b1093ded3f1e2 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/mors.nix')
| -rw-r--r-- | lass/1systems/mors.nix | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index e2ab562fa..a7a1fd253 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -14,7 +14,7 @@ ../2configs/elster.nix ../2configs/steam.nix ../2configs/wine.nix - ../2configs/texlive.nix + #../2configs/texlive.nix ../2configs/binary-caches.nix #../2configs/ircd.nix ../2configs/chromium-patched.nix @@ -175,14 +175,14 @@ emulateWheel = true; }; - #services.xserver = { - # videoDriver = "intel"; - # vaapiDrivers = [ pkgs.vaapiIntel ]; - # deviceSection = '' - # Option "AccelMethod" "sna" - # BusID "PCI:0:2:0" - # ''; - #}; + services.xserver = { + videoDriver = "intel"; + vaapiDrivers = [ pkgs.vaapiIntel ]; + deviceSection = '' + Option "AccelMethod" "sna" + BusID "PCI:0:2:0" + ''; + }; environment.systemPackages = with pkgs; [ acronym @@ -193,6 +193,7 @@ hashPassword urban mk_sql_pair + remmina ]; #TODO: fix this shit |