diff options
| -rw-r--r-- | common.nix | 8 | ||||
| -rw-r--r-- | machines/dnyarri.nix | 6 | ||||
| -rw-r--r-- | machines/mmrnmhrm.nix | 6 |
3 files changed, 9 insertions, 11 deletions
diff --git a/common.nix b/common.nix index eafd45d9..e78c8988 100644 --- a/common.nix +++ b/common.nix @@ -95,6 +95,11 @@ ATTRS{serial}=="0001", OWNER="aszlig", SYMLINK+="axbo" ''; + mesa = { + driSupport32Bit = true; + s3tcSupport = true; + }; + xserver = { enable = true; layout = "dvorak"; @@ -102,9 +107,6 @@ startGnuPGAgent = true; startOpenSSHAgent = false; - driSupport32Bit = true; - s3tcSupport = true; - displayManager.sessionCommands = '' ${pkgs.redshift}/bin/redshift -l 48.428404:10.866007 & ''; diff --git a/machines/dnyarri.nix b/machines/dnyarri.nix index a2f5001a..e638cd2f 100644 --- a/machines/dnyarri.nix +++ b/machines/dnyarri.nix @@ -128,9 +128,7 @@ with import ../lib; services.synergy.client.enable = true; services.synergy.client.serverAddress = "mmrnmhrm"; - services.xserver = { - videoDrivers = [ "ati" ]; + services.mesa.videoDrivers = [ "ati" ]; - xrandrHeads = [ "HDMI-0" "DVI-0" ]; - }; + services.xserver.xrandrHeads = [ "HDMI-0" "DVI-0" ]; } diff --git a/machines/mmrnmhrm.nix b/machines/mmrnmhrm.nix index f8412c0a..057b514c 100644 --- a/machines/mmrnmhrm.nix +++ b/machines/mmrnmhrm.nix @@ -44,8 +44,6 @@ with import ../lib; services.synergy.server.enable = true; services.synergy.server.configFile = ../cfgfiles/synergy.conf; - services.xserver = { - videoDrivers = [ "nouveau" ]; - xrandrHeads = [ "DVI-I-2" "DVI-I-1" ]; - }; + services.mesa.videoDrivers = [ "nouveau" ]; + services.xserver.xrandrHeads = [ "DVI-I-2" "DVI-I-1" ]; } |