diff options
| -rw-r--r-- | common.nix | 9 | ||||
| -rw-r--r-- | machines/dnyarri.nix | 2 | ||||
| -rw-r--r-- | machines/mmrnmhrm.nix | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/common.nix b/common.nix index a74d33b9..9e2157a8 100644 --- a/common.nix +++ b/common.nix @@ -29,6 +29,10 @@ pulseaudio.package = pkgs.pulseaudio.override { useSystemd = true; }; + opengl = { + driSupport32Bit = true; + s3tcSupport = true; + }; }; users.defaultUserShell = "/var/run/current-system/sw/bin/zsh"; @@ -95,11 +99,6 @@ ATTRS{serial}=="0001", OWNER="aszlig", SYMLINK+="axbo" ''; - mesa = { - driSupport32Bit = true; - s3tcSupport = true; - }; - xserver = { enable = true; layout = "dvorak"; diff --git a/machines/dnyarri.nix b/machines/dnyarri.nix index 3b7b90cb..efbebb8b 100644 --- a/machines/dnyarri.nix +++ b/machines/dnyarri.nix @@ -127,7 +127,7 @@ with import ../lib; services.synergy.client.enable = true; services.synergy.client.serverAddress = "mmrnmhrm"; - services.mesa.videoDrivers = [ "ati" ]; + hardware.opengl.videoDrivers = [ "ati" ]; services.xserver.xrandrHeads = [ "HDMI-0" "DVI-0" ]; } diff --git a/machines/mmrnmhrm.nix b/machines/mmrnmhrm.nix index c22f7de0..926f8297 100644 --- a/machines/mmrnmhrm.nix +++ b/machines/mmrnmhrm.nix @@ -44,6 +44,6 @@ with import ../lib; services.synergy.server.enable = true; services.synergy.server.configFile = ../cfgfiles/synergy.conf; - services.mesa.videoDrivers = [ "nouveau" ]; + hardware.opengl.videoDrivers = [ "nouveau" ]; services.xserver.xrandrHeads = [ "DVI-I-2" "DVI-I-1" ]; } |