commit 2e3d9e8d74fdcbcea364923f0ba6537774894865 · pyrox.dev/nixpkgs

+7 -7

nixos/doc/manual/configuration/x-windows.chapter.md

···

       69
       69
        
       hardware.opengl.driSupport32Bit = true;

     

       70
       70
        
       ```

     

       71
       71
        
       

     

       72
       72
       -
       ## Auto-login {#sec-x11-auto-login .unnumbered}

     

       72
       72
       +
       ## Auto-login {#sec-x11-auto-login}

     

       73
       73
        
       

     

       74
       74
        
       The x11 login screen can be skipped entirely, automatically logging you

     

       75
       75
        
       into your window manager and desktop environment when you boot your

     
···

       96
       96
        
       services.xserver.displayManager.autoLogin.user = "alice";

     

       97
       97
        
       ```

     

       98
       98
        
       

     

       99
       99
       -
       ## Intel Graphics drivers {#sec-x11--graphics-cards-intel .unnumbered}

     

       99
       99
       +
       ## Intel Graphics drivers {#sec-x11--graphics-cards-intel}

     

       100
       100
        
       

     

       101
       101
        
       There are two choices for Intel Graphics drivers in X.org: `modesetting`

     

       102
       102
        
       (included in the xorg-server itself) and `intel` (provided by the

     
···

       136
       136
        
       Note that this will likely downgrade the performance compared to

     

       137
       137
        
       `modesetting` or `intel` with DRI 3 (default).

     

       138
       138
        
       

     

       139
       139
       -
       ## Proprietary NVIDIA drivers {#sec-x11-graphics-cards-nvidia .unnumbered}

     

       139
       139
       +
       ## Proprietary NVIDIA drivers {#sec-x11-graphics-cards-nvidia}

     

       140
       140
        
       

     

       141
       141
        
       NVIDIA provides a proprietary driver for its graphics cards that has

     

       142
       142
        
       better 3D performance than the X.org drivers. It is not enabled by

     
···

       158
       158
        
       You may need to reboot after enabling this driver to prevent a clash

     

       159
       159
        
       with other kernel modules.

     

       160
       160
        
       

     

       161
       161
       -
       ## Proprietary AMD drivers {#sec-x11--graphics-cards-amd .unnumbered}

     

       161
       161
       +
       ## Proprietary AMD drivers {#sec-x11--graphics-cards-amd}

     

       162
       162
        
       

     

       163
       163
        
       AMD provides a proprietary driver for its graphics cards that is not

     

       164
       164
        
       enabled by default because it's not Free Software, is often broken in

     
···

       173
       173
        
       You will need to reboot after enabling this driver to prevent a clash

     

       174
       174
        
       with other kernel modules.

     

       175
       175
        
       

     

       176
       176
       -
       ## Touchpads {#sec-x11-touchpads .unnumbered}

     

       176
       176
       +
       ## Touchpads {#sec-x11-touchpads}

     

       177
       177
        
       

     

       178
       178
        
       Support for Synaptics touchpads (found in many laptops such as the Dell

     

       179
       179
        
       Latitude series) can be enabled as follows:

     
···

       192
       192
        
       Note: the use of `services.xserver.synaptics` is deprecated since NixOS

     

       193
       193
        
       17.09.

     

       194
       194
        
       

     

       195
       195
       -
       ## GTK/Qt themes {#sec-x11-gtk-and-qt-themes .unnumbered}

     

       195
       195
       +
       ## GTK/Qt themes {#sec-x11-gtk-and-qt-themes}

     

       196
       196
        
       

     

       197
       197
        
       GTK themes can be installed either to user profile or system-wide (via

     

       198
       198
        
       `environment.systemPackages`). To make Qt 5 applications look similar to

     
···

       204
       204
        
       qt.style = "gtk2";

     

       205
       205
        
       ```

     

       206
       206
        
       

     

       207
       207
       -
       ## Custom XKB layouts {#custom-xkb-layouts .unnumbered}

     

       207
       207
       +
       ## Custom XKB layouts {#custom-xkb-layouts}

     

       208
       208
        
       

     

       209
       209
        
       It is possible to install custom [ XKB

     

       210
       210
        
       ](https://en.wikipedia.org/wiki/X_keyboard_extension) keyboard layouts

+2 -2

nixos/doc/manual/configuration/xfce.chapter.md

···

       24
       24
        
       manually (system wide), put them into your

     

       25
       25
        
       [](#opt-environment.systemPackages) from `pkgs.xfce`.

     

       26
       26
        
       

     

       27
       27
       -
       ## Thunar {#sec-xfce-thunar-plugins .unnumbered}

     

       27
       27
       +
       ## Thunar {#sec-xfce-thunar-plugins}

     

       28
       28
        
       

     

       29
       29
        
       Thunar (the Xfce file manager) is automatically enabled when Xfce is

     

       30
       30
        
       enabled. To enable Thunar without enabling Xfce, use the configuration

     
···

       35
       35
        
       [](#opt-programs.thunar.plugins). You shouldn't just add them to

     

       36
       36
        
       [](#opt-environment.systemPackages).

     

       37
       37
        
       

     

       38
       38
       -
       ## Troubleshooting {#sec-xfce-troubleshooting .unnumbered}

     

       38
       38
       +
       ## Troubleshooting {#sec-xfce-troubleshooting}

     

       39
       39
        
       

     

       40
       40
        
       Even after enabling udisks2, volume management might not work. Thunar

     

       41
       41
        
       and/or the desktop takes time to show up. Thunar will spit out this kind

+4 -4

nixos/doc/manual/development/option-def.section.md

···

       12
       12
        
       However, sometimes you need to wrap an option definition or set of

     

       13
       13
        
       option definitions in a *property* to achieve certain effects:

     

       14
       14
        
       

     

       15
       15
       -
       ## Delaying Conditionals {#sec-option-definitions-delaying-conditionals .unnumbered}

     

       15
       15
       +
       ## Delaying Conditionals {#sec-option-definitions-delaying-conditionals}

     

       16
       16
        
       

     

       17
       17
        
       If a set of option definitions is conditional on the value of another

     

       18
       18
        
       option, you may need to use `mkIf`. Consider, for instance:

     
···

       56
       56
        
       };

     

       57
       57
        
       ```

     

       58
       58
        
       

     

       59
       59
       -
       ## Setting Priorities {#sec-option-definitions-setting-priorities .unnumbered}

     

       59
       59
       +
       ## Setting Priorities {#sec-option-definitions-setting-priorities}

     

       60
       60
        
       

     

       61
       61
        
       A module can override the definitions of an option in other modules by

     

       62
       62
        
       setting an *override priority*. All option definitions that do not have the lowest

     
···

       72
       72
        
       be discarded. The function `mkForce` is equal to `mkOverride 50`, and

     

       73
       73
        
       `mkDefault` is equal to `mkOverride 1000`.

     

       74
       74
        
       

     

       75
       75
       -
       ## Ordering Definitions {#sec-option-definitions-ordering .unnumbered}

     

       75
       75
       +
       ## Ordering Definitions {#sec-option-definitions-ordering}

     

       76
       76
        
       

     

       77
       77
        
       It is also possible to influence the order in which the definitions for an option are

     

       78
       78
        
       merged by setting an *order priority* with `mkOrder`. The default order priority is 1000.

     
···

       89
       89
        
       Note that this is different from [override priorities](#sec-option-definitions-setting-priorities):

     

       90
       90
        
       setting an order does not affect whether the definition is included or not.

     

       91
       91
        
       

     

       92
       92
       -
       ## Merging Configurations {#sec-option-definitions-merging .unnumbered}

     

       92
       92
       +
       ## Merging Configurations {#sec-option-definitions-merging}

     

       93
       93
        
       

     

       94
       94
        
       In conjunction with `mkIf`, it is sometimes useful for a module to

     

       95
       95
        
       return multiple sets of option definitions, to be merged together as if