commit 3a6c79cff6aa6f4c29af04b544ab367561f11346 · pyrox.dev/nixpkgs

+3 -3

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

···

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

     

       46
       46
        
       

     

       47
       47
        
       ```nix

     

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

     

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

     

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

     

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

     

       50
       50
        
       ```

     

       51
       51
        
       

     

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

     
···

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

     

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

     

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

     

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

     

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

     

       270
       270
        
       

     

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

     

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

+2 -1

nixos/doc/manual/release-notes/rl-2311.section.md

···

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

     

       270
       270
        
         `mkOrder n` with n ≤ 400.

     

       271
       271
        
       

     

       272
       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
       273
       +
       

     

       272
       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.

     

       273
       275
        
       

     

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

     
···

       442
       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`.

     

       443
       445
        
       

     

       444
       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).

     

       445
       445
       -

+2 -2

nixos/modules/config/console.nix

···

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

     

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

     

       129
       129
        
                     } \

     

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

     

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

     

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

     

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

     

       132
       132
        
                 '');

     

       133
       133
        
           }

     

       134
       134

+3 -3

nixos/modules/installer/tools/tools.nix

···

       163
       163
        
               # console = {

     

       164
       164
        
               #   font = "Lat2-Terminus16";

     

       165
       165
        
               #   keyMap = "us";

     

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

     

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

     

       167
       167
        
               # };

     

       168
       168
        
       

     

       169
       169
        
             $xserverConfig

     

       170
       170
        
       

     

       171
       171
        
             $desktopConfiguration

     

       172
       172
        
               # Configure keymap in X11

     

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

     

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

     

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

     

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

     

       175
       175
        
       

     

       176
       176
        
               # Enable CUPS to print documents.

     

       177
       177
        
               # services.printing.enable = true;

+1 -1

nixos/modules/services/x11/desktop-managers/enlightenment.nix

···

       90
       90
        
               };

     

       91
       91
        
           };

     

       92
       92
        
       

     

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

     

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

     

       94
       94
        
       

     

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

     

       96
       96

+1 -1

nixos/modules/services/x11/desktop-managers/plasma5.nix

···

       309
       309
        
               "/share"

     

       310
       310
        
             ];

     

       311
       311
        
       

     

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

     

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

     

       313
       313
        
       

     

       314
       314
        
             environment.sessionVariables = {

     

       315
       315
        
               PLASMA_USE_QT_SCALING = mkIf cfg.useQtScaling "1";

+4 -4

nixos/modules/services/x11/display-managers/sddm.nix

···

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

     

       205
       205
        
                     };

     

       206
       206
        
                     keyboard = {

     

       207
       207
       -
                       keymap_model = xcfg.xkbModel;

     

       208
       208
       -
                       keymap_layout = xcfg.layout;

     

       209
       209
       -
                       keymap_variant = xcfg.xkbVariant;

     

       210
       210
       -
                       keymap_options = xcfg.xkbOptions;

     

       207
       207
       +
                       keymap_model = xcfg.xkb.model;

     

       208
       208
       +
                       keymap_layout = xcfg.xkb.layout;

     

       209
       209
       +
                       keymap_variant = xcfg.xkb.variant;

     

       210
       210
       +
                       keymap_options = xcfg.xkb.options;

     

       211
       211
        
                     };

     

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

     

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

+2 -2

nixos/modules/services/x11/extra-layouts.nix

···

       121
       121
        
           environment.sessionVariables = {

     

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

     

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

     

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

     

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

     

       125
       125
        
           };

     

       126
       126
        
       

     

       127
       127
        
           services.xserver = {

     

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

     

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

     

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

     

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

     

       131
       131
        
           };

+78 -46

nixos/modules/services/x11/xserver.nix

···

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

     

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

     

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

     

       178
       178
       +
             (lib.mkRenamedOptionModuleWith {

     

       179
       179
       +
               sinceRelease = 2311;

     

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

     

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

     

       182
       182
       +
             })

     

       183
       183
       +
             (lib.mkRenamedOptionModuleWith {

     

       184
       184
       +
               sinceRelease = 2311;

     

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

     

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

     

       187
       187
       +
             })

     

       188
       188
       +
             (lib.mkRenamedOptionModuleWith {

     

       189
       189
       +
               sinceRelease = 2311;

     

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

     

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

     

       192
       192
       +
             })

     

       193
       193
       +
             (lib.mkRenamedOptionModuleWith {

     

       194
       194
       +
               sinceRelease = 2311;

     

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

     

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

     

       197
       197
       +
             })

     

       198
       198
       +
             (lib.mkRenamedOptionModuleWith {

     

       199
       199
       +
               sinceRelease = 2311;

     

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

     

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

     

       202
       202
       +
             })

     

       178
       203
        
           ];

     

       179
       204
        
       

     

       180
       205
        
       

     
···

       339
       364
        
               '';

     

       340
       365
        
             };

     

       341
       366
        
       

     

       342
       342
       -
             layout = mkOption {

     

       343
       343
       -
               type = types.str;

     

       344
       344
       -
               default = "us";

     

       345
       345
       -
               description = lib.mdDoc ''

     

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

     

       347
       347
       -
               '';

     

       348
       348
       -
             };

     

       367
       367
       +
             xkb = mkOption {

     

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

     

       369
       369
       +
               type = types.submodule {

     

       370
       370
       +
                 options = {

     

       371
       371
       +
                   layout = mkOption {

     

       372
       372
       +
                     type = types.str;

     

       373
       373
       +
                     default = "us";

     

       374
       374
       +
                     description = lib.mdDoc ''

     

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

     

       376
       376
       +
                     '';

     

       377
       377
       +
                   };

     

       349
       378
        
       

     

       350
       350
       -
             xkbModel = mkOption {

     

       351
       351
       -
               type = types.str;

     

       352
       352
       -
               default = "pc104";

     

       353
       353
       -
               example = "presario";

     

       354
       354
       -
               description = lib.mdDoc ''

     

       355
       355
       -
                 Keyboard model.

     

       356
       356
       -
               '';

     

       357
       357
       -
             };

     

       379
       379
       +
                   model = mkOption {

     

       380
       380
       +
                     type = types.str;

     

       381
       381
       +
                     default = "pc104";

     

       382
       382
       +
                     example = "presario";

     

       383
       383
       +
                     description = lib.mdDoc ''

     

       384
       384
       +
                       Keyboard model.

     

       385
       385
       +
                     '';

     

       386
       386
       +
                   };

     

       358
       387
        
       

     

       359
       359
       -
             xkbOptions = mkOption {

     

       360
       360
       -
               type = types.commas;

     

       361
       361
       -
               default = "terminate:ctrl_alt_bksp";

     

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

     

       363
       363
       -
               description = lib.mdDoc ''

     

       364
       364
       -
                 X keyboard options; layout switching goes here.

     

       365
       365
       -
               '';

     

       366
       366
       -
             };

     

       388
       388
       +
                   options = mkOption {

     

       389
       389
       +
                     type = types.commas;

     

       390
       390
       +
                     default = "terminate:ctrl_alt_bksp";

     

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

     

       392
       392
       +
                     description = lib.mdDoc ''

     

       393
       393
       +
                       X keyboard options; layout switching goes here.

     

       394
       394
       +
                     '';

     

       395
       395
       +
                   };

     

       367
       396
        
       

     

       368
       368
       -
             xkbVariant = mkOption {

     

       369
       369
       -
               type = types.str;

     

       370
       370
       -
               default = "";

     

       371
       371
       -
               example = "colemak";

     

       372
       372
       -
               description = lib.mdDoc ''

     

       373
       373
       -
                 X keyboard variant.

     

       374
       374
       -
               '';

     

       375
       375
       -
             };

     

       397
       397
       +
                   variant = mkOption {

     

       398
       398
       +
                     type = types.str;

     

       399
       399
       +
                     default = "";

     

       400
       400
       +
                     example = "colemak";

     

       401
       401
       +
                     description = lib.mdDoc ''

     

       402
       402
       +
                       X keyboard variant.

     

       403
       403
       +
                     '';

     

       404
       404
       +
                   };

     

       376
       405
        
       

     

       377
       377
       -
             xkbDir = mkOption {

     

       378
       378
       -
               type = types.path;

     

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

     

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

     

       381
       381
       -
               description = lib.mdDoc ''

     

       382
       382
       -
                 Path used for -xkbdir xserver parameter.

     

       383
       383
       -
               '';

     

       406
       406
       +
                   dir = mkOption {

     

       407
       407
       +
                     type = types.path;

     

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

     

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

     

       410
       410
       +
                     description = lib.mdDoc ''

     

       411
       411
       +
                       Path used for -xkbdir xserver parameter.

     

       412
       412
       +
                     '';

     

       413
       413
       +
                   };

     

       414
       414
       +
                 };

     

       415
       415
       +
               };

     

       384
       416
        
             };

     

       385
       417
        
       

     

       386
       418
        
             config = mkOption {

     
···

       667
       699
        
               {

     

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

     

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

     

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

     

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

     

       671
       703
        
               })

     

       672
       704
        
             # localectl looks into 00-keyboard.conf

     

       673
       705
        
             //{

     
···

       675
       707
        
                   Section "InputClass"

     

       676
       708
        
                     Identifier "Keyboard catchall"

     

       677
       709
        
                     MatchIsKeyboard "on"

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       682
       714
        
                   EndSection

     

       683
       715
        
                 '';

     

       684
       716
        
               }

     
···

       759
       791
        
       

     

       760
       792
        
           services.xserver.displayManager.xserverArgs =

     

       761
       793
        
             [ "-config ${configFile}"

     

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

     

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

     

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

     

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

     

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

     
···

       777
       809
        
             ];

     

       778
       810
        
       

     

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

     

       780
       780
       -
             inherit (cfg) xkbModel layout xkbVariant xkbOptions;

     

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

     

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

     

       782
       814
        
             preferLocalBuild = true;

     

       783
       815
        
           } ''

     

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

     

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

     

       786
       818
        
             }

     

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

     

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

     

       788
       820
        
             touch "$out"

     

       789
       821
        
           '');

     

       790
       822

+14 -14

nixos/tests/keymap.nix

···

       31
       31
        
       

     

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

     

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

     

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

     

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

     

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

     

       36
       36
        
       

     

       37
       37
        
           testScript = ''

     
···

       116
       116
        
           };

     

       117
       117
        
       

     

       118
       118
        
           extraConfig.console.keyMap = "fr";

     

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

     

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

     

       120
       120
        
         };

     

       121
       121
        
       

     

       122
       122
        
         bone = {

     
···

       130
       130
        
           };

     

       131
       131
        
       

     

       132
       132
        
           extraConfig.console.keyMap = "bone";

     

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

     

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

     

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

     

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

     

       135
       135
        
         };

     

       136
       136
        
       

     

       137
       137
        
         colemak = {

     
···

       141
       141
        
           };

     

       142
       142
        
       

     

       143
       143
        
           extraConfig.console.keyMap = "colemak";

     

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

     

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

     

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

     

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

     

       146
       146
        
         };

     

       147
       147
        
       

     

       148
       148
        
         dvorak = {

     
···

       154
       154
        
           };

     

       155
       155
        
       

     

       156
       156
        
           extraConfig.console.keyMap = "dvorak";

     

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

     

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

     

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

     

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

     

       159
       159
        
         };

     

       160
       160
        
       

     

       161
       161
        
         dvorak-programmer = {

     
···

       170
       170
        
           };

     

       171
       171
        
       

     

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

     

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

     

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

     

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

     

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

     

       175
       175
        
         };

     

       176
       176
        
       

     

       177
       177
        
         neo = {

     
···

       185
       185
        
           };

     

       186
       186
        
       

     

       187
       187
        
           extraConfig.console.keyMap = "neo";

     

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

     

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

     

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

     

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

     

       190
       190
        
         };

     

       191
       191
        
       

     

       192
       192
        
         qwertz = {

     
···

       199
       199
        
           };

     

       200
       200
        
       

     

       201
       201
        
           extraConfig.console.keyMap = "de";

     

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

     

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

     

       203
       203
        
         };

     

       204
       204
        
       

     

       205
       205
        
         custom = {

     
···

       212
       212
        
           };

     

       213
       213
        
       

     

       214
       214
        
           extraConfig.console.useXkbConfig = true;

     

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

     

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

     

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

     

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

     

       218
       218
        
               languages   = [ "eng" ];

+4 -4

pkgs/tools/X11/xkbvalidate/xkbvalidate.c

···

       121
       121
        
       

     

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

     

       123
       123
        
       

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       128
       128
        
       

     

       129
       129
        
           free_logs();

     

       130
       130
        
           rdef->model = argv[1];