commit 01b3d0bf257fab99617e8583814717668ef6f736 · pyrox.dev/nixpkgs

+10

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

···

       1390
       1390
        
                 for those who want to use it.

     

       1391
       1391
        
               </para>

     

       1392
       1392
        
             </listitem>

     

       1393
       1393
       +
             <listitem>

     

       1394
       1394
       +
               <para>

     

       1395
       1395
       +
                 A NixOS module for Firefox has been added which allows

     

       1396
       1396
       +
                 preferences and

     

       1397
       1397
       +
                 <link xlink:href="https://github.com/mozilla/policy-templates/blob/master/README.md">policies</link>

     

       1398
       1398
       +
                 to be set. This also allows extensions to be installed via the

     

       1399
       1399
       +
                 <literal>ExtensionSettings</literal> policy. The new options

     

       1400
       1400
       +
                 are under <literal>programs.firefox</literal>.

     

       1401
       1401
       +
               </para>

     

       1402
       1402
       +
             </listitem>

     

       1393
       1403
        
           </itemizedlist>

     

       1394
       1404
        
         </section>

     

       1395
       1405
        
       </section>

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

···

       420
       420
        
       

     

       421
       421
        
       - The `mame` package does not ship with its tools anymore in the default output. They were moved to a separate `tools` output instead. For convenience, `mame-tools` package was added for those who want to use it.

     

       422
       422
        
       

     

       423
       423
       +
       - A NixOS module for Firefox has been added which allows preferences and [policies](https://github.com/mozilla/policy-templates/blob/master/README.md) to be set. This also allows extensions to be installed via the `ExtensionSettings` policy. The new options are under `programs.firefox`.

     

       424
       424
       +
       

     

       423
       425
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/module-list.nix

···

       157
       157
        
         ./programs/extra-container.nix

     

       158
       158
        
         ./programs/feedbackd.nix

     

       159
       159
        
         ./programs/file-roller.nix

     

       160
       160
       +
         ./programs/firefox.nix

     

       160
       161
        
         ./programs/firejail.nix

     

       161
       162
        
         ./programs/fish.nix

     

       162
       163
        
         ./programs/flashrom.nix

+91

nixos/modules/programs/firefox.nix

···

       1
       1
       +
       { pkgs, config, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.programs.firefox;

     

       7
       7
       +
       

     

       8
       8
       +
         policyFormat = pkgs.formats.json { };

     

       9
       9
       +
       

     

       10
       10
       +
         organisationInfo = ''

     

       11
       11
       +
           When this option is in use, Firefox will inform you that "your browser

     

       12
       12
       +
           is managed by your organisation". That message appears because NixOS

     

       13
       13
       +
           installs what you have declared here such that it cannot be overridden

     

       14
       14
       +
           through the user interface. It does not mean that someone else has been

     

       15
       15
       +
           given control of your browser, unless of course they also control your

     

       16
       16
       +
           NixOS configuration.

     

       17
       17
       +
         '';

     

       18
       18
       +
       

     

       19
       19
       +
       in {

     

       20
       20
       +
         options.programs.firefox = {

     

       21
       21
       +
           enable = mkEnableOption (mdDoc "the Firefox web browser");

     

       22
       22
       +
       

     

       23
       23
       +
           package = mkOption {

     

       24
       24
       +
             description = mdDoc "Firefox package to use.";

     

       25
       25
       +
             type = types.package;

     

       26
       26
       +
             default = pkgs.firefox;

     

       27
       27
       +
             defaultText = literalExpression "pkgs.firefox";

     

       28
       28
       +
             relatedPackages = [

     

       29
       29
       +
               "firefox"

     

       30
       30
       +
               "firefox-beta-bin"

     

       31
       31
       +
               "firefox-bin"

     

       32
       32
       +
               "firefox-devedition-bin"

     

       33
       33
       +
               "firefox-esr"

     

       34
       34
       +
               "firefox-esr-wayland"

     

       35
       35
       +
               "firefox-wayland"

     

       36
       36
       +
             ];

     

       37
       37
       +
           };

     

       38
       38
       +
       

     

       39
       39
       +
           policies = mkOption {

     

       40
       40
       +
             description = mdDoc ''

     

       41
       41
       +
               Group policies to install.

     

       42
       42
       +
       

     

       43
       43
       +
               See [Mozilla's documentation](https://github.com/mozilla/policy-templates/blob/master/README.md")

     

       44
       44
       +
               for a list of available options.

     

       45
       45
       +
       

     

       46
       46
       +
               This can be used to install extensions declaratively! Check out the

     

       47
       47
       +
               documentation of the `ExtensionSettings` policy for details.

     

       48
       48
       +
       

     

       49
       49
       +
               ${organisationInfo}

     

       50
       50
       +
             '';

     

       51
       51
       +
             type = policyFormat.type;

     

       52
       52
       +
             default = {};

     

       53
       53
       +
           };

     

       54
       54
       +
       

     

       55
       55
       +
           preferences = mkOption {

     

       56
       56
       +
             description = mdDoc ''

     

       57
       57
       +
               Preferences to set from `about://config`.

     

       58
       58
       +
       

     

       59
       59
       +
               Some of these might be able to be configured more ergonomically

     

       60
       60
       +
               using policies.

     

       61
       61
       +
       

     

       62
       62
       +
               ${organisationInfo}

     

       63
       63
       +
             '';

     

       64
       64
       +
             type = with types; attrsOf (oneOf [ bool int string ]);

     

       65
       65
       +
             default = {};

     

       66
       66
       +
           };

     

       67
       67
       +
         };

     

       68
       68
       +
       

     

       69
       69
       +
         config = mkIf cfg.enable {

     

       70
       70
       +
           environment.systemPackages = [ cfg.package ];

     

       71
       71
       +
       

     

       72
       72
       +
           environment.etc."firefox/policies/policies.json".source =

     

       73
       73
       +
             let policiesJSON =

     

       74
       74
       +
               policyFormat.generate

     

       75
       75
       +
               "firefox-policies.json"

     

       76
       76
       +
               { inherit (cfg) policies; };

     

       77
       77
       +
             in mkIf (cfg.policies != {}) "${policiesJSON}";

     

       78
       78
       +
       

     

       79
       79
       +
           # Preferences are converted into a policy

     

       80
       80
       +
           programs.firefox.policies =

     

       81
       81
       +
             mkIf (cfg.preferences != {})

     

       82
       82
       +
             {

     

       83
       83
       +
               Preferences = (mapAttrs (name: value: {

     

       84
       84
       +
                 Value = value;

     

       85
       85
       +
                 Status = "locked";

     

       86
       86
       +
               }) cfg.preferences);

     

       87
       87
       +
             };

     

       88
       88
       +
         };

     

       89
       89
       +
       

     

       90
       90
       +
         meta.maintainers = with maintainers; [ danth ];

     

       91
       91
       +
       }