commit ec4f38c56f0a7dfc9b2f9db111250f925e009c7d · pyrox.dev/nixpkgs

+3 -2

nixos/modules/config/pulseaudio.nix

···

       71
       71
        
             };

     

       72
       72
        
       

     

       73
       73
        
             configFile = mkOption {

     

       74
       74
       -
               type = types.uniq types.path;

     

       75
       75
       -
               default = "${cfg.package}/etc/pulse/default.pa";

     

       74
       74
       +
               type = types.path;

     

       76
       75
        
               description = ''

     

       77
       76
        
                 The path to the configuration the PulseAudio server

     

       78
       77
        
                 should use. By default, the "default.pa" configuration

     
···

       112
       111
        
               target = "pulse/client.conf";

     

       113
       112
        
               source = clientConf;

     

       114
       113
        
             };

     

       114
       114
       +
       

     

       115
       115
       +
             hardware.pulseaudio.configFile = mkDefault "${cfg.package}/etc/pulse/default.pa";

     

       115
       116
        
           }

     

       116
       117
        
       

     

       117
       118
        
           (mkIf cfg.enable {

+21 -17

nixos/modules/services/hardware/pommed.nix

···

       4
       4
        
       

     

       5
       5
        
       {

     

       6
       6
        
       

     

       7
       7
       -
         options.services.hardware.pommed = {

     

       8
       8
       -
           enable = mkOption {

     

       9
       9
       -
             default = false;

     

       10
       10
       -
              description = ''

     

       11
       11
       -
               Whether to use the pommed tool to handle Apple laptop keyboard hotkeys.

     

       12
       12
       -
             '';

     

       13
       13
       -
           };

     

       7
       7
       +
         options = {

     

       8
       8
       +
       

     

       9
       9
       +
           services.hardware.pommed = {

     

       14
       10
        
       

     

       15
       15
       -
           configFile = mkOption {

     

       16
       16
       -
             default = "${pkgs.pommed}/etc/pommed.conf";

     

       17
       17
       -
             description = ''

     

       18
       18
       -
               The contents of the pommed.conf file.

     

       19
       19
       -
             '';

     

       11
       11
       +
             enable = mkOption {

     

       12
       12
       +
               type = types.bool;

     

       13
       13
       +
               default = false;

     

       14
       14
       +
               description = ''

     

       15
       15
       +
                 Whether to use the pommed tool to handle Apple laptop keyboard hotkeys.

     

       16
       16
       +
               '';

     

       17
       17
       +
             };

     

       18
       18
       +
       

     

       19
       19
       +
             configFile = mkOption {

     

       20
       20
       +
               type = types.path;

     

       21
       21
       +
               description = ''

     

       22
       22
       +
                 The path to the <filename>pommed.conf</filename> file.

     

       23
       23
       +
               '';

     

       24
       24
       +
             };

     

       20
       25
        
           };

     

       26
       26
       +
       

     

       21
       27
        
         };

     

       22
       28
        
       

     

       23
       29
        
         config = mkIf config.services.hardware.pommed.enable {

     

       24
       30
        
           environment.systemPackages = [ pkgs.polkit ];

     

       25
       31
        
       

     

       26
       26
       -
           environment.etc = [

     

       27
       27
       -
             { source = config.services.hardware.pommed.configFile;

     

       28
       28
       -
               target = "pommed.conf";

     

       29
       29
       -
             }

     

       30
       30
       -
           ];

     

       32
       32
       +
           environment.etc."pommed.conf".source = config.services.hardware.pommed.configFile;

     

       33
       33
       +
       

     

       34
       34
       +
           services.hardware.pommed.configFile = "${pkgs.pommed}/etc/pommed.conf";

     

       31
       35
        
       

     

       32
       36
        
           services.dbus.packages = [ pkgs.pommed ];

     

       33
       37

+6 -1

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

···

       169
       169
        
       

     

       170
       170
        
             xserverBin = mkOption {

     

       171
       171
        
               type = types.path;

     

       172
       172
       -
               default = "${xorg.xorgserver}/bin/X";

     

       173
       172
        
               description = "Path to the X server used by display managers.";

     

       174
       173
        
             };

     

       175
       174
        
       

     
···

       277
       276
        
             };

     

       278
       277
        
       

     

       279
       278
        
           };

     

       279
       279
       +
       

     

       280
       280
       +
         };

     

       281
       281
       +
       

     

       282
       282
       +
         config = {

     

       283
       283
       +
       

     

       284
       284
       +
           services.xserver.displayManager.xserverBin = "${xorg.xorgserver}/bin/X";

     

       280
       285
        
       

     

       281
       286
        
         };

     

       282
       287