commit 0c81594a29d99d9ee9c9c88c680340d56823cfb2 · pyrox.dev/nixpkgs

+11 -1
nixos/modules/tasks/kbd.nix
···

       98
       98
        
                 '') config.i18n.consoleColors}

     

       99
       99
        
               '';

     

       100
       100
        
       

     

       101
       101
       +
               /* XXX: systemd-vconsole-setup needs a "main" terminal. By default

     

       102
       102
       +
                * /dev/tty0 is used which wouldn't work when the service is restarted

     

       103
       103
       +
                * from X11. We set this to /dev/tty1; not ideal because it may also be

     

       104
       104
       +
                * owned by X11 or something else.

     

       105
       105
       +
                *

     

       106
       106
       +
                * See #22470.

     

       107
       107
       +
                */

     

       101
       108
        
               systemd.services."systemd-vconsole-setup" =

     

       102
       109
        
                 { wantedBy = [ "sysinit.target" ];

     

       103
       110
        
                   before = [ "display-manager.service" ];

     

       104
       111
        
                   after = [ "systemd-udev-settle.service" ];

     

       105
       112
        
                   restartTriggers = [ vconsoleConf kbdEnv ];

     

       106
       106
       -
                   restartIfChanged = false; # fails when tty is inactive

     

       113
       113
       +
                   serviceConfig.ExecStart = [

     

       114
       114
       +
                     ""

     

       115
       115
       +
                     "${pkgs.systemd}/lib/systemd/systemd-vconsole-setup /dev/tty1"

     

       116
       116
       +
                   ];

     

       107
       117
        
                 };

     

       108
       118
        
             }

     

       109
       119