ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-02 02:27:33 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #188084 from thiagokokada/refactor-xserver

Browse Source 
nixos/xserver: remove useGlamor option
This commit is contained in:
Thiago Kenji Okada 2022-08-24 15:25:19 +01:00 committed by GitHub
commit 59058bae2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/doc/manual/configuration/x-windows.chapter.md
View File

@ -120,7 +120,6 @@ to set one. The recommended configuration for modern systems is:
```nix ```nix
services.xserver.videoDrivers = [ "modesetting" ]; services.xserver.videoDrivers = [ "modesetting" ];
services.xserver.useGlamor = true;
``` ```
If you experience screen tearing no matter what, this configuration was If you experience screen tearing no matter what, this configuration was

1
nixos/doc/manual/from_md/configuration/x-windows.chapter.xml
View File

@ -133,7 +133,6 @@ services.xserver.displayManager.autoLogin.user = "alice";
</para> </para>
<programlisting language="bash"> <programlisting language="bash">
services.xserver.videoDrivers = [ &quot;modesetting&quot; ]; services.xserver.videoDrivers = [ &quot;modesetting&quot; ];
services.xserver.useGlamor = true;
</programlisting> </programlisting>
<para> <para>
If you experience screen tearing no matter what, this If you experience screen tearing no matter what, this

21
nixos/modules/services/x11/xserver.nix
View File

@ -151,8 +151,10 @@ in
(mkRemovedOptionModule (mkRemovedOptionModule
[ "services" "xserver" "startDbusSession" ] [ "services" "xserver" "startDbusSession" ]
"The user D-Bus session is now always socket activated and this option can safely be removed.") "The user D-Bus session is now always socket activated and this option can safely be removed.")
(mkRemovedOptionModule ["services" "xserver" "useXFS" ] (mkRemovedOptionModule [ "services" "xserver" "useXFS" ]
"Use services.xserver.fontPath instead of useXFS") "Use services.xserver.fontPath instead of useXFS")
(mkRemovedOptionModule [ "services" "xserver" "useGlamor" ]
"Option services.xserver.useGlamor was removed because it is unnecessary. Drivers that uses Glamor will use it automatically.")
]; ];
@ -555,15 +557,6 @@ in
''; '';
}; };
useGlamor = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Whether to use the Glamor module for 2D acceleration,
if possible.
'';
};
enableCtrlAltBackspace = mkOption { enableCtrlAltBackspace = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -794,13 +787,6 @@ in
'')} '')}
EndSection EndSection
${if cfg.useGlamor then ''
Section "Module"
Load "dri2"
Load "glamoregl"
EndSection
'' else ""}
# For each supported driver, add a "Device" and "Screen" # For each supported driver, add a "Device" and "Screen"
# section. # section.
${flip concatMapStrings cfg.drivers (driver: '' ${flip concatMapStrings cfg.drivers (driver: ''
@ -808,7 +794,6 @@ in
Section "Device" Section "Device"
Identifier "Device-${driver.name}[0]" Identifier "Device-${driver.name}[0]"
Driver "${driver.driverName or driver.name}" Driver "${driver.driverName or driver.name}"
${if cfg.useGlamor then ''Option "AccelMethod" "glamor"'' else ""}
${indent cfg.deviceSection} ${indent cfg.deviceSection}
${indent (driver.deviceSection or "")} ${indent (driver.deviceSection or "")}
${indent xrandrDeviceSection} ${indent xrandrDeviceSection}