commit 2248bdfbbcf14bebc5e2ee0d6b870b33dd3d5cf3 · pyrox.dev/nixpkgs

+11 -10
nixos/modules/services/x11/display-managers/sddm.nix
···

       7
       7
        
         cfg = dmcfg.sddm;

     

       8
       8
        
         xEnv = config.systemd.services.display-manager.environment;

     

       9
       9
        
       

     

       10
       10
       -
         sddm = cfg.package;

     

       10
       10
       +
         sddm = cfg.package.override(old: { extraPackages = old.extraPackages or [] ++ cfg.extraPackages; });

     

       11
       11
        
       

     

       12
       12
        
         iniFmt = pkgs.formats.ini { };

     

       13
       13
        
       

     
···

       140
       140
        
               '';

     

       141
       141
        
             };

     

       142
       142
        
       

     

       143
       143
       +
             extraPackages = mkOption {

     

       144
       144
       +
               type = types.listOf types.package;

     

       145
       145
       +
               default = [];

     

       146
       146
       +
               defaultText = "[]";

     

       147
       147
       +
               description = lib.mdDoc ''

     

       148
       148
       +
                 Extra Qt plugins / QML libraries to add to the environment.

     

       149
       149
       +
               '';

     

       150
       150
       +
             };

     

       151
       151
       +
       

     

       143
       152
        
             autoNumlock = mkOption {

     

       144
       153
        
               type = types.bool;

     

       145
       154
        
               default = false;

     
···

       235
       244
        
             }

     

       236
       245
        
           ];

     

       237
       246
        
       

     

       238
       238
       -
           services.xserver.displayManager.job = {

     

       239
       239
       -
             environment = {

     

       240
       240
       -
               # Load themes from system environment

     

       241
       241
       -
               QT_PLUGIN_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtPluginPrefix;

     

       242
       242
       -
               QML2_IMPORT_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtQmlPrefix;

     

       243
       243
       -
             };

     

       244
       244
       -
       

     

       245
       245
       -
             execCmd = "exec /run/current-system/sw/bin/sddm";

     

       246
       246
       -
           };

     

       247
       247
       +
           services.xserver.displayManager.job.execCmd = "exec /run/current-system/sw/bin/sddm";

     

       247
       248
        
       

     

       248
       249
        
           security.pam.services = {

     

       249
       250
        
             sddm.text = ''