···

       
45
       
 
       
You can set the keyboard layout (and optionally the layout variant):

     

       
46
       
 
       


     

       
47
       
 
       
```nix

     

       
48
       
-
       
services.xserver.layout = "de";

     

       
49
       
-
       
services.xserver.xkbVariant = "neo";

     

       
50
       
 
       
```

     

       
51
       
 
       


     

       
52
       
 
       
The X server is started automatically at boot time. If you don't want

     
···

       
266
       
 
       
layout should be ready to use. You can try it by e.g. running

     

       
267
       
 
       
`setxkbmap us-greek` and then type `<alt>+a` (it may not get applied in

     

       
268
       
 
       
your terminal straight away). To change the default, the usual

     

       
269
       
-
       
`services.xserver.layout` option can still be used.

     

       
270
       
 
       


     

       
271
       
 
       
A layout can have several other components besides `xkb_symbols`, for

     

       
272
       
 
       
example we will define new keycodes for some multimedia key and bind

     

···

       
45
       
 
       
You can set the keyboard layout (and optionally the layout variant):

     

       
46
       
 
       


     

       
47
       
 
       
```nix

     

       
48
       
+
       
services.xserver.xkb.layout = "de";

     

       
49
       
+
       
services.xserver.xkb.variant = "neo";

     

       
50
       
 
       
```

     

       
51
       
 
       


     

       
52
       
 
       
The X server is started automatically at boot time. If you don't want

     
···

       
266
       
 
       
layout should be ready to use. You can try it by e.g. running

     

       
267
       
 
       
`setxkbmap us-greek` and then type `<alt>+a` (it may not get applied in

     

       
268
       
 
       
your terminal straight away). To change the default, the usual

     

       
269
       
+
       
`services.xserver.xkb.layout` option can still be used.

     

       
270
       
 
       


     

       
271
       
 
       
A layout can have several other components besides `xkb_symbols`, for

     

       
272
       
 
       
example we will define new keycodes for some multimedia key and bind

     

···

       
269
       
 
       
  order, or relying on `mkBefore` and `mkAfter`, but may impact users calling

     

       
270
       
 
       
  `mkOrder n` with n ≤ 400.

     

       
271
       
 
       


     

       
0
       
 
       

     

       
0
       
 
       

     

       
272
       
 
       
- `networking.networkmanager.firewallBackend` was removed as NixOS is now using iptables-nftables-compat even when using iptables, therefore Networkmanager now uses the nftables backend unconditionally.

     

       
273
       
 
       


     

       
274
       
 
       
- [`lib.lists.foldl'`](https://nixos.org/manual/nixpkgs/stable#function-library-lib.lists.foldl-prime) now always evaluates the initial accumulator argument first.

     
···

       
442
       
 
       
- The `electron` packages now places its application files in `$out/libexec/electron` instead of `$out/lib/electron`. Packages using electron-builder will fail to build and need to be adjusted by changing `lib` to `libexec`.

     

       
443
       
 
       


     

       
444
       
 
       
- `teleport` has been upgraded from major version 12 to major version 14. Please see upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and release notes for versions [13](https://goteleport.com/docs/changelog/#1300-050823) and [14](https://goteleport.com/docs/changelog/#1400-092023). Note that Teleport does not officially support upgrades across more than one major version at a time. If you're running Teleport server components, it is recommended to first upgrade to an intermediate 13.x version by setting `services.teleport.package = pkgs.teleport_13`. Afterwards, this option can be removed to upgrade to the default version (14).

     

       
445
       
-
       


     

···

       
269
       
 
       
  order, or relying on `mkBefore` and `mkAfter`, but may impact users calling

     

       
270
       
 
       
  `mkOrder n` with n ≤ 400.

     

       
271
       
 
       


     

       
272
       
+
       
- X keyboard extension (XKB) options have been reorganized into a single attribute set, `services.xserver.xkb`. Specifically, `services.xserver.layout` is now `services.xserver.xkb.layout`, `services.xserver.xkbModel` is now `services.xserver.xkb.model`, `services.xserver.xkbOptions` is now `services.xserver.xkb.options`, `services.xserver.xkbVariant` is now `services.xserver.xkb.variant`, and `services.xserver.xkbDir` is now `services.xserver.xkb.dir`.

     

       
273
       
+
       


     

       
274
       
 
       
- `networking.networkmanager.firewallBackend` was removed as NixOS is now using iptables-nftables-compat even when using iptables, therefore Networkmanager now uses the nftables backend unconditionally.

     

       
275
       
 
       


     

       
276
       
 
       
- [`lib.lists.foldl'`](https://nixos.org/manual/nixpkgs/stable#function-library-lib.lists.foldl-prime) now always evaluates the initial accumulator argument first.

     
···

       
444
       
 
       
- The `electron` packages now places its application files in `$out/libexec/electron` instead of `$out/lib/electron`. Packages using electron-builder will fail to build and need to be adjusted by changing `lib` to `libexec`.

     

       
445
       
 
       


     

       
446
       
 
       
- `teleport` has been upgraded from major version 12 to major version 14. Please see upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and release notes for versions [13](https://goteleport.com/docs/changelog/#1300-050823) and [14](https://goteleport.com/docs/changelog/#1400-092023). Note that Teleport does not officially support upgrades across more than one major version at a time. If you're running Teleport server components, it is recommended to first upgrade to an intermediate 13.x version by setting `services.teleport.package = pkgs.teleport_13`. Afterwards, this option can be removed to upgrade to the default version (14).

     

       
0
       
 
       

     

···

       
127
       
 
       
              ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT)

     

       
128
       
 
       
                "-I${config.environment.sessionVariables.XKB_CONFIG_ROOT}"

     

       
129
       
 
       
              } \

     

       
130
       
-
       
              -model '${xkbModel}' -layout '${layout}' \

     

       
131
       
-
       
              -option '${xkbOptions}' -variant '${xkbVariant}' > "$out"

     

       
132
       
 
       
          '');

     

       
133
       
 
       
    }

     

       
134
       
 
       


     

···

       
127
       
 
       
              ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT)

     

       
128
       
 
       
                "-I${config.environment.sessionVariables.XKB_CONFIG_ROOT}"

     

       
129
       
 
       
              } \

     

       
130
       
+
       
              -model '${xkb.model}' -layout '${xkb.layout}' \

     

       
131
       
+
       
              -option '${xkb.options}' -variant '${xkb.variant}' > "$out"

     

       
132
       
 
       
          '');

     

       
133
       
 
       
    }

     

       
134
       
 
       


     

···

       
163
       
 
       
        # console = {

     

       
164
       
 
       
        #   font = "Lat2-Terminus16";

     

       
165
       
 
       
        #   keyMap = "us";

     

       
166
       
-
       
        #   useXkbConfig = true; # use xkbOptions in tty.

     

       
167
       
 
       
        # };

     

       
168
       
 
       


     

       
169
       
 
       
      $xserverConfig

     

       
170
       
 
       


     

       
171
       
 
       
      $desktopConfiguration

     

       
172
       
 
       
        # Configure keymap in X11

     

       
173
       
-
       
        # services.xserver.layout = "us";

     

       
174
       
-
       
        # services.xserver.xkbOptions = "eurosign:e,caps:escape";

     

       
175
       
 
       


     

       
176
       
 
       
        # Enable CUPS to print documents.

     

       
177
       
 
       
        # services.printing.enable = true;

     

···

       
163
       
 
       
        # console = {

     

       
164
       
 
       
        #   font = "Lat2-Terminus16";

     

       
165
       
 
       
        #   keyMap = "us";

     

       
166
       
+
       
        #   useXkbConfig = true; # use xkb.options in tty.

     

       
167
       
 
       
        # };

     

       
168
       
 
       


     

       
169
       
 
       
      $xserverConfig

     

       
170
       
 
       


     

       
171
       
 
       
      $desktopConfiguration

     

       
172
       
 
       
        # Configure keymap in X11

     

       
173
       
+
       
        # services.xserver.xkb.layout = "us";

     

       
174
       
+
       
        # services.xserver.xkb.options = "eurosign:e,caps:escape";

     

       
175
       
 
       


     

       
176
       
 
       
        # Enable CUPS to print documents.

     

       
177
       
 
       
        # services.printing.enable = true;

     

···

       
90
       
 
       
        };

     

       
91
       
 
       
    };

     

       
92
       
 
       


     

       
93
       
-
       
    environment.etc."X11/xkb".source = xcfg.xkbDir;

     

       
94
       
 
       


     

       
95
       
 
       
    fonts.packages = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];

     

       
96
       
 
       


     

···

       
90
       
 
       
        };

     

       
91
       
 
       
    };

     

       
92
       
 
       


     

       
93
       
+
       
    environment.etc."X11/xkb".source = xcfg.xkb.dir;

     

       
94
       
 
       


     

       
95
       
 
       
    fonts.packages = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];

     

       
96
       
 
       


     

···

       
309
       
 
       
        "/share"

     

       
310
       
 
       
      ];

     

       
311
       
 
       


     

       
312
       
-
       
      environment.etc."X11/xkb".source = xcfg.xkbDir;

     

       
313
       
 
       


     

       
314
       
 
       
      environment.sessionVariables = {

     

       
315
       
 
       
        PLASMA_USE_QT_SCALING = mkIf cfg.useQtScaling "1";

     

···

       
309
       
 
       
        "/share"

     

       
310
       
 
       
      ];

     

       
311
       
 
       


     

       
312
       
+
       
      environment.etc."X11/xkb".source = xcfg.xkb.dir;

     

       
313
       
 
       


     

       
314
       
 
       
      environment.sessionVariables = {

     

       
315
       
 
       
        PLASMA_USE_QT_SCALING = mkIf cfg.useQtScaling "1";

     

···

       
204
       
 
       
                left-handed = xcfg.libinput.mouse.leftHanded;

     

       
205
       
 
       
              };

     

       
206
       
 
       
              keyboard = {

     

       
207
       
-
       
                keymap_model = xcfg.xkbModel;

     

       
208
       
-
       
                keymap_layout = xcfg.layout;

     

       
209
       
-
       
                keymap_variant = xcfg.xkbVariant;

     

       
210
       
-
       
                keymap_options = xcfg.xkbOptions;

     

       
211
       
 
       
              };

     

       
212
       
 
       
            }; in "${pkgs.weston}/bin/weston --shell=fullscreen-shell.so -c ${westonIni}";

     

       
213
       
 
       
          description = lib.mdDoc "Command used to start the selected compositor";

     

···

       
204
       
 
       
                left-handed = xcfg.libinput.mouse.leftHanded;

     

       
205
       
 
       
              };

     

       
206
       
 
       
              keyboard = {

     

       
207
       
+
       
                keymap_model = xcfg.xkb.model;

     

       
208
       
+
       
                keymap_layout = xcfg.xkb.layout;

     

       
209
       
+
       
                keymap_variant = xcfg.xkb.variant;

     

       
210
       
+
       
                keymap_options = xcfg.xkb.options;

     

       
211
       
 
       
              };

     

       
212
       
 
       
            }; in "${pkgs.weston}/bin/weston --shell=fullscreen-shell.so -c ${westonIni}";

     

       
213
       
 
       
          description = lib.mdDoc "Command used to start the selected compositor";

     

···

       
121
       
 
       
    environment.sessionVariables = {

     

       
122
       
 
       
      # runtime override supported by multiple libraries e. g. libxkbcommon

     

       
123
       
 
       
      # https://xkbcommon.org/doc/current/group__include-path.html

     

       
124
       
-
       
      XKB_CONFIG_ROOT = config.services.xserver.xkbDir;

     

       
125
       
 
       
    };

     

       
126
       
 
       


     

       
127
       
 
       
    services.xserver = {

     

       
128
       
-
       
      xkbDir = "${xkb_patched}/etc/X11/xkb";

     

       
129
       
 
       
      exportConfiguration = config.services.xserver.displayManager.startx.enable

     

       
130
       
 
       
        || config.services.xserver.displayManager.sx.enable;

     

       
131
       
 
       
    };

     

···

       
121
       
 
       
    environment.sessionVariables = {

     

       
122
       
 
       
      # runtime override supported by multiple libraries e. g. libxkbcommon

     

       
123
       
 
       
      # https://xkbcommon.org/doc/current/group__include-path.html

     

       
124
       
+
       
      XKB_CONFIG_ROOT = config.services.xserver.xkb.dir;

     

       
125
       
 
       
    };

     

       
126
       
 
       


     

       
127
       
 
       
    services.xserver = {

     

       
128
       
+
       
      xkb.dir = "${xkb_patched}/etc/X11/xkb";

     

       
129
       
 
       
      exportConfiguration = config.services.xserver.displayManager.startx.enable

     

       
130
       
 
       
        || config.services.xserver.displayManager.sx.enable;

     

       
131
       
 
       
    };

     

···

       
175
       
 
       
        "Use services.xserver.fontPath instead of useXFS")

     

       
176
       
 
       
      (mkRemovedOptionModule [ "services" "xserver" "useGlamor" ]

     

       
177
       
 
       
        "Option services.xserver.useGlamor was removed because it is unnecessary. Drivers that uses Glamor will use it automatically.")

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
178
       
 
       
    ];

     

       
179
       
 
       


     

       
180
       
 
       


     
···

       
339
       
 
       
        '';

     

       
340
       
 
       
      };

     

       
341
       
 
       


     

       
342
       
-
       
      layout = mkOption {

     

       
343
       
-
       
        type = types.str;

     

       
344
       
-
       
        default = "us";

     

       
345
       
-
       
        description = lib.mdDoc ''

     

       
346
       
-
       
          Keyboard layout, or multiple keyboard layouts separated by commas.

     

       
347
       
-
       
        '';

     

       
348
       
-
       
      };

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
349
       
 
       


     

       
350
       
-
       
      xkbModel = mkOption {

     

       
351
       
-
       
        type = types.str;

     

       
352
       
-
       
        default = "pc104";

     

       
353
       
-
       
        example = "presario";

     

       
354
       
-
       
        description = lib.mdDoc ''

     

       
355
       
-
       
          Keyboard model.

     

       
356
       
-
       
        '';

     

       
357
       
-
       
      };

     

       
358
       
 
       


     

       
359
       
-
       
      xkbOptions = mkOption {

     

       
360
       
-
       
        type = types.commas;

     

       
361
       
-
       
        default = "terminate:ctrl_alt_bksp";

     

       
362
       
-
       
        example = "grp:caps_toggle,grp_led:scroll";

     

       
363
       
-
       
        description = lib.mdDoc ''

     

       
364
       
-
       
          X keyboard options; layout switching goes here.

     

       
365
       
-
       
        '';

     

       
366
       
-
       
      };

     

       
367
       
 
       


     

       
368
       
-
       
      xkbVariant = mkOption {

     

       
369
       
-
       
        type = types.str;

     

       
370
       
-
       
        default = "";

     

       
371
       
-
       
        example = "colemak";

     

       
372
       
-
       
        description = lib.mdDoc ''

     

       
373
       
-
       
          X keyboard variant.

     

       
374
       
-
       
        '';

     

       
375
       
-
       
      };

     

       
376
       
 
       


     

       
377
       
-
       
      xkbDir = mkOption {

     

       
378
       
-
       
        type = types.path;

     

       
379
       
-
       
        default = "${pkgs.xkeyboard_config}/etc/X11/xkb";

     

       
380
       
-
       
        defaultText = literalExpression ''"''${pkgs.xkeyboard_config}/etc/X11/xkb"'';

     

       
381
       
-
       
        description = lib.mdDoc ''

     

       
382
       
-
       
          Path used for -xkbdir xserver parameter.

     

       
383
       
-
       
        '';

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
384
       
 
       
      };

     

       
385
       
 
       


     

       
386
       
 
       
      config = mkOption {

     
···

       
667
       
 
       
        {

     

       
668
       
 
       
          "X11/xorg.conf".source = "${configFile}";

     

       
669
       
 
       
          # -xkbdir command line option does not seems to be passed to xkbcomp.

     

       
670
       
-
       
          "X11/xkb".source = "${cfg.xkbDir}";

     

       
671
       
 
       
        })

     

       
672
       
 
       
      # localectl looks into 00-keyboard.conf

     

       
673
       
 
       
      //{

     
···

       
675
       
 
       
            Section "InputClass"

     

       
676
       
 
       
              Identifier "Keyboard catchall"

     

       
677
       
 
       
              MatchIsKeyboard "on"

     

       
678
       
-
       
              Option "XkbModel" "${cfg.xkbModel}"

     

       
679
       
-
       
              Option "XkbLayout" "${cfg.layout}"

     

       
680
       
-
       
              Option "XkbOptions" "${cfg.xkbOptions}"

     

       
681
       
-
       
              Option "XkbVariant" "${cfg.xkbVariant}"

     

       
682
       
 
       
            EndSection

     

       
683
       
 
       
          '';

     

       
684
       
 
       
        }

     
···

       
759
       
 
       


     

       
760
       
 
       
    services.xserver.displayManager.xserverArgs =

     

       
761
       
 
       
      [ "-config ${configFile}"

     

       
762
       
-
       
        "-xkbdir" "${cfg.xkbDir}"

     

       
763
       
 
       
      ] ++ optional (cfg.display != null) ":${toString cfg.display}"

     

       
764
       
 
       
        ++ optional (cfg.tty     != null) "vt${toString cfg.tty}"

     

       
765
       
 
       
        ++ optional (cfg.dpi     != null) "-dpi ${toString cfg.dpi}"

     
···

       
777
       
 
       
      ];

     

       
778
       
 
       


     

       
779
       
 
       
    system.checks = singleton (pkgs.runCommand "xkb-validated" {

     

       
780
       
-
       
      inherit (cfg) xkbModel layout xkbVariant xkbOptions;

     

       
781
       
 
       
      nativeBuildInputs = with pkgs.buildPackages; [ xkbvalidate ];

     

       
782
       
 
       
      preferLocalBuild = true;

     

       
783
       
 
       
    } ''

     

       
784
       
 
       
      ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT)

     

       
785
       
 
       
        "export XKB_CONFIG_ROOT=${config.environment.sessionVariables.XKB_CONFIG_ROOT}"

     

       
786
       
 
       
      }

     

       
787
       
-
       
      xkbvalidate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions"

     

       
788
       
 
       
      touch "$out"

     

       
789
       
 
       
    '');

     

       
790
       
 
       


     

···

       
175
       
 
       
        "Use services.xserver.fontPath instead of useXFS")

     

       
176
       
 
       
      (mkRemovedOptionModule [ "services" "xserver" "useGlamor" ]

     

       
177
       
 
       
        "Option services.xserver.useGlamor was removed because it is unnecessary. Drivers that uses Glamor will use it automatically.")

     

       
178
       
+
       
      (lib.mkRenamedOptionModuleWith {

     

       
179
       
+
       
        sinceRelease = 2311;

     

       
180
       
+
       
        from = [ "services" "xserver" "layout" ];

     

       
181
       
+
       
        to = [ "services" "xserver" "xkb" "layout" ];

     

       
182
       
+
       
      })

     

       
183
       
+
       
      (lib.mkRenamedOptionModuleWith {

     

       
184
       
+
       
        sinceRelease = 2311;

     

       
185
       
+
       
        from = [ "services" "xserver" "xkbModel" ];

     

       
186
       
+
       
        to = [ "services" "xserver" "xkb" "model" ];

     

       
187
       
+
       
      })

     

       
188
       
+
       
      (lib.mkRenamedOptionModuleWith {

     

       
189
       
+
       
        sinceRelease = 2311;

     

       
190
       
+
       
        from = [ "services" "xserver" "xkbOptions" ];

     

       
191
       
+
       
        to = [ "services" "xserver" "xkb" "options" ];

     

       
192
       
+
       
      })

     

       
193
       
+
       
      (lib.mkRenamedOptionModuleWith {

     

       
194
       
+
       
        sinceRelease = 2311;

     

       
195
       
+
       
        from = [ "services" "xserver" "xkbVariant" ];

     

       
196
       
+
       
        to = [ "services" "xserver" "xkb" "variant" ];

     

       
197
       
+
       
      })

     

       
198
       
+
       
      (lib.mkRenamedOptionModuleWith {

     

       
199
       
+
       
        sinceRelease = 2311;

     

       
200
       
+
       
        from = [ "services" "xserver" "xkbDir" ];

     

       
201
       
+
       
        to = [ "services" "xserver" "xkb" "dir" ];

     

       
202
       
+
       
      })

     

       
203
       
 
       
    ];

     

       
204
       
 
       


     

       
205
       
 
       


     
···

       
364
       
 
       
        '';

     

       
365
       
 
       
      };

     

       
366
       
 
       


     

       
367
       
+
       
      xkb = mkOption {

     

       
368
       
+
       
        description = "X keyboard extension (XKB) configuration";

     

       
369
       
+
       
        type = types.submodule {

     

       
370
       
+
       
          options = {

     

       
371
       
+
       
            layout = mkOption {

     

       
372
       
+
       
              type = types.str;

     

       
373
       
+
       
              default = "us";

     

       
374
       
+
       
              description = lib.mdDoc ''

     

       
375
       
+
       
                Keyboard layout, or multiple keyboard layouts separated by commas.

     

       
376
       
+
       
              '';

     

       
377
       
+
       
            };

     

       
378
       
 
       


     

       
379
       
+
       
            model = mkOption {

     

       
380
       
+
       
              type = types.str;

     

       
381
       
+
       
              default = "pc104";

     

       
382
       
+
       
              example = "presario";

     

       
383
       
+
       
              description = lib.mdDoc ''

     

       
384
       
+
       
                Keyboard model.

     

       
385
       
+
       
              '';

     

       
386
       
+
       
            };

     

       
387
       
 
       


     

       
388
       
+
       
            options = mkOption {

     

       
389
       
+
       
              type = types.commas;

     

       
390
       
+
       
              default = "terminate:ctrl_alt_bksp";

     

       
391
       
+
       
              example = "grp:caps_toggle,grp_led:scroll";

     

       
392
       
+
       
              description = lib.mdDoc ''

     

       
393
       
+
       
                X keyboard options; layout switching goes here.

     

       
394
       
+
       
              '';

     

       
395
       
+
       
            };

     

       
396
       
 
       


     

       
397
       
+
       
            variant = mkOption {

     

       
398
       
+
       
              type = types.str;

     

       
399
       
+
       
              default = "";

     

       
400
       
+
       
              example = "colemak";

     

       
401
       
+
       
              description = lib.mdDoc ''

     

       
402
       
+
       
                X keyboard variant.

     

       
403
       
+
       
              '';

     

       
404
       
+
       
            };

     

       
405
       
 
       


     

       
406
       
+
       
            dir = mkOption {

     

       
407
       
+
       
              type = types.path;

     

       
408
       
+
       
              default = "${pkgs.xkeyboard_config}/etc/X11/xkb";

     

       
409
       
+
       
              defaultText = literalExpression ''"''${pkgs.xkeyboard_config}/etc/X11/xkb"'';

     

       
410
       
+
       
              description = lib.mdDoc ''

     

       
411
       
+
       
                Path used for -xkbdir xserver parameter.

     

       
412
       
+
       
              '';

     

       
413
       
+
       
            };

     

       
414
       
+
       
          };

     

       
415
       
+
       
        };

     

       
416
       
 
       
      };

     

       
417
       
 
       


     

       
418
       
 
       
      config = mkOption {

     
···

       
699
       
 
       
        {

     

       
700
       
 
       
          "X11/xorg.conf".source = "${configFile}";

     

       
701
       
 
       
          # -xkbdir command line option does not seems to be passed to xkbcomp.

     

       
702
       
+
       
          "X11/xkb".source = "${cfg.xkb.dir}";

     

       
703
       
 
       
        })

     

       
704
       
 
       
      # localectl looks into 00-keyboard.conf

     

       
705
       
 
       
      //{

     
···

       
707
       
 
       
            Section "InputClass"

     

       
708
       
 
       
              Identifier "Keyboard catchall"

     

       
709
       
 
       
              MatchIsKeyboard "on"

     

       
710
       
+
       
              Option "XkbModel" "${cfg.xkb.model}"

     

       
711
       
+
       
              Option "XkbLayout" "${cfg.xkb.layout}"

     

       
712
       
+
       
              Option "XkbOptions" "${cfg.xkb.options}"

     

       
713
       
+
       
              Option "XkbVariant" "${cfg.xkb.variant}"

     

       
714
       
 
       
            EndSection

     

       
715
       
 
       
          '';

     

       
716
       
 
       
        }

     
···

       
791
       
 
       


     

       
792
       
 
       
    services.xserver.displayManager.xserverArgs =

     

       
793
       
 
       
      [ "-config ${configFile}"

     

       
794
       
+
       
        "-xkbdir" "${cfg.xkb.dir}"

     

       
795
       
 
       
      ] ++ optional (cfg.display != null) ":${toString cfg.display}"

     

       
796
       
 
       
        ++ optional (cfg.tty     != null) "vt${toString cfg.tty}"

     

       
797
       
 
       
        ++ optional (cfg.dpi     != null) "-dpi ${toString cfg.dpi}"

     
···

       
809
       
 
       
      ];

     

       
810
       
 
       


     

       
811
       
 
       
    system.checks = singleton (pkgs.runCommand "xkb-validated" {

     

       
812
       
+
       
      inherit (cfg.xkb) model layout variant options;

     

       
813
       
 
       
      nativeBuildInputs = with pkgs.buildPackages; [ xkbvalidate ];

     

       
814
       
 
       
      preferLocalBuild = true;

     

       
815
       
 
       
    } ''

     

       
816
       
 
       
      ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT)

     

       
817
       
 
       
        "export XKB_CONFIG_ROOT=${config.environment.sessionVariables.XKB_CONFIG_ROOT}"

     

       
818
       
 
       
      }

     

       
819
       
+
       
      xkbvalidate "$model" "$layout" "$variant" "$options"

     

       
820
       
 
       
      touch "$out"

     

       
821
       
 
       
    '');

     

       
822
       
 
       


     

···

       
31
       
 
       


     

       
32
       
 
       
    nodes.machine.console.keyMap = mkOverride 900 layout;

     

       
33
       
 
       
    nodes.machine.services.xserver.desktopManager.xterm.enable = false;

     

       
34
       
-
       
    nodes.machine.services.xserver.layout = mkOverride 900 layout;

     

       
35
       
 
       
    nodes.machine.imports = [ ./common/x11.nix extraConfig ];

     

       
36
       
 
       


     

       
37
       
 
       
    testScript = ''

     
···

       
116
       
 
       
    };

     

       
117
       
 
       


     

       
118
       
 
       
    extraConfig.console.keyMap = "fr";

     

       
119
       
-
       
    extraConfig.services.xserver.layout = "fr";

     

       
120
       
 
       
  };

     

       
121
       
 
       


     

       
122
       
 
       
  bone = {

     
···

       
130
       
 
       
    };

     

       
131
       
 
       


     

       
132
       
 
       
    extraConfig.console.keyMap = "bone";

     

       
133
       
-
       
    extraConfig.services.xserver.layout = "de";

     

       
134
       
-
       
    extraConfig.services.xserver.xkbVariant = "bone";

     

       
135
       
 
       
  };

     

       
136
       
 
       


     

       
137
       
 
       
  colemak = {

     
···

       
141
       
 
       
    };

     

       
142
       
 
       


     

       
143
       
 
       
    extraConfig.console.keyMap = "colemak";

     

       
144
       
-
       
    extraConfig.services.xserver.layout = "us";

     

       
145
       
-
       
    extraConfig.services.xserver.xkbVariant = "colemak";

     

       
146
       
 
       
  };

     

       
147
       
 
       


     

       
148
       
 
       
  dvorak = {

     
···

       
154
       
 
       
    };

     

       
155
       
 
       


     

       
156
       
 
       
    extraConfig.console.keyMap = "dvorak";

     

       
157
       
-
       
    extraConfig.services.xserver.layout = "us";

     

       
158
       
-
       
    extraConfig.services.xserver.xkbVariant = "dvorak";

     

       
159
       
 
       
  };

     

       
160
       
 
       


     

       
161
       
 
       
  dvorak-programmer = {

     
···

       
170
       
 
       
    };

     

       
171
       
 
       


     

       
172
       
 
       
    extraConfig.console.keyMap = "dvorak-programmer";

     

       
173
       
-
       
    extraConfig.services.xserver.layout = "us";

     

       
174
       
-
       
    extraConfig.services.xserver.xkbVariant = "dvp";

     

       
175
       
 
       
  };

     

       
176
       
 
       


     

       
177
       
 
       
  neo = {

     
···

       
185
       
 
       
    };

     

       
186
       
 
       


     

       
187
       
 
       
    extraConfig.console.keyMap = "neo";

     

       
188
       
-
       
    extraConfig.services.xserver.layout = "de";

     

       
189
       
-
       
    extraConfig.services.xserver.xkbVariant = "neo";

     

       
190
       
 
       
  };

     

       
191
       
 
       


     

       
192
       
 
       
  qwertz = {

     
···

       
199
       
 
       
    };

     

       
200
       
 
       


     

       
201
       
 
       
    extraConfig.console.keyMap = "de";

     

       
202
       
-
       
    extraConfig.services.xserver.layout = "de";

     

       
203
       
 
       
  };

     

       
204
       
 
       


     

       
205
       
 
       
  custom = {

     
···

       
212
       
 
       
    };

     

       
213
       
 
       


     

       
214
       
 
       
    extraConfig.console.useXkbConfig = true;

     

       
215
       
-
       
    extraConfig.services.xserver.layout = "us-greek";

     

       
216
       
 
       
    extraConfig.services.xserver.extraLayouts.us-greek =

     

       
217
       
 
       
      { description = "US layout with alt-gr greek";

     

       
218
       
 
       
        languages   = [ "eng" ];

     

···

       
31
       
 
       


     

       
32
       
 
       
    nodes.machine.console.keyMap = mkOverride 900 layout;

     

       
33
       
 
       
    nodes.machine.services.xserver.desktopManager.xterm.enable = false;

     

       
34
       
+
       
    nodes.machine.services.xserver.xkb.layout = mkOverride 900 layout;

     

       
35
       
 
       
    nodes.machine.imports = [ ./common/x11.nix extraConfig ];

     

       
36
       
 
       


     

       
37
       
 
       
    testScript = ''

     
···

       
116
       
 
       
    };

     

       
117
       
 
       


     

       
118
       
 
       
    extraConfig.console.keyMap = "fr";

     

       
119
       
+
       
    extraConfig.services.xserver.xkb.layout = "fr";

     

       
120
       
 
       
  };

     

       
121
       
 
       


     

       
122
       
 
       
  bone = {

     
···

       
130
       
 
       
    };

     

       
131
       
 
       


     

       
132
       
 
       
    extraConfig.console.keyMap = "bone";

     

       
133
       
+
       
    extraConfig.services.xserver.xkb.layout = "de";

     

       
134
       
+
       
    extraConfig.services.xserver.xkb.variant = "bone";

     

       
135
       
 
       
  };

     

       
136
       
 
       


     

       
137
       
 
       
  colemak = {

     
···

       
141
       
 
       
    };

     

       
142
       
 
       


     

       
143
       
 
       
    extraConfig.console.keyMap = "colemak";

     

       
144
       
+
       
    extraConfig.services.xserver.xkb.layout = "us";

     

       
145
       
+
       
    extraConfig.services.xserver.xkb.variant = "colemak";

     

       
146
       
 
       
  };

     

       
147
       
 
       


     

       
148
       
 
       
  dvorak = {

     
···

       
154
       
 
       
    };

     

       
155
       
 
       


     

       
156
       
 
       
    extraConfig.console.keyMap = "dvorak";

     

       
157
       
+
       
    extraConfig.services.xserver.xkb.layout = "us";

     

       
158
       
+
       
    extraConfig.services.xserver.xkb.variant = "dvorak";

     

       
159
       
 
       
  };

     

       
160
       
 
       


     

       
161
       
 
       
  dvorak-programmer = {

     
···

       
170
       
 
       
    };

     

       
171
       
 
       


     

       
172
       
 
       
    extraConfig.console.keyMap = "dvorak-programmer";

     

       
173
       
+
       
    extraConfig.services.xserver.xkb.layout = "us";

     

       
174
       
+
       
    extraConfig.services.xserver.xkb.variant = "dvp";

     

       
175
       
 
       
  };

     

       
176
       
 
       


     

       
177
       
 
       
  neo = {

     
···

       
185
       
 
       
    };

     

       
186
       
 
       


     

       
187
       
 
       
    extraConfig.console.keyMap = "neo";

     

       
188
       
+
       
    extraConfig.services.xserver.xkb.layout = "de";

     

       
189
       
+
       
    extraConfig.services.xserver.xkb.variant = "neo";

     

       
190
       
 
       
  };

     

       
191
       
 
       


     

       
192
       
 
       
  qwertz = {

     
···

       
199
       
 
       
    };

     

       
200
       
 
       


     

       
201
       
 
       
    extraConfig.console.keyMap = "de";

     

       
202
       
+
       
    extraConfig.services.xserver.xkb.layout = "de";

     

       
203
       
 
       
  };

     

       
204
       
 
       


     

       
205
       
 
       
  custom = {

     
···

       
212
       
 
       
    };

     

       
213
       
 
       


     

       
214
       
 
       
    extraConfig.console.useXkbConfig = true;

     

       
215
       
+
       
    extraConfig.services.xserver.xkb.layout = "us-greek";

     

       
216
       
 
       
    extraConfig.services.xserver.extraLayouts.us-greek =

     

       
217
       
 
       
      { description = "US layout with alt-gr greek";

     

       
218
       
 
       
        languages   = [ "eng" ];

     

···

       
121
       
 
       


     

       
122
       
 
       
    rdef = malloc(sizeof(struct xkb_rule_names));

     

       
123
       
 
       


     

       
124
       
-
       
    TRY_KEYMAP(model,   argv[1], "xkbModel");

     

       
125
       
-
       
    TRY_KEYMAP(layout,  argv[2], "layout");

     

       
126
       
-
       
    TRY_KEYMAP(variant, argv[3], "xkbVariant");

     

       
127
       
-
       
    TRY_KEYMAP(options, argv[4], "xkbOptions");

     

       
128
       
 
       


     

       
129
       
 
       
    free_logs();

     

       
130
       
 
       
    rdef->model = argv[1];

     

···

       
121
       
 
       


     

       
122
       
 
       
    rdef = malloc(sizeof(struct xkb_rule_names));

     

       
123
       
 
       


     

       
124
       
+
       
    TRY_KEYMAP(model,   argv[1], "xkb.model");

     

       
125
       
+
       
    TRY_KEYMAP(layout,  argv[2], "xkb.layout");

     

       
126
       
+
       
    TRY_KEYMAP(variant, argv[3], "xkb.variant");

     

       
127
       
+
       
    TRY_KEYMAP(options, argv[4], "xkb.options");

     

       
128
       
 
       


     

       
129
       
 
       
    free_logs();

     

       
130
       
 
       
    rdef->model = argv[1];