Commit d3c27efa authored by K900's avatar K900
Browse files

nixos/firefox: remove `nixpkgs.config` usage

parent 018f62a1

nixos/modules/programs/browserpass.nix

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,6 @@ with lib; 
      "opt/brave/native-messaging-hosts/${appId}".source = source "hosts/chromium";

      "opt/brave/policies/managed/${appId}".source = source "policies/chromium";

    };

    nixpkgs.config.firefox.enableBrowserpass = true;

    programs.firefox.wrapperConfig.enableBrowserpass = true;

  };

}

nixos/modules/programs/firefox.nix

+20 −8
Original line number Diff line number Diff line
@@ -36,6 +36,12 @@ in 
      ];

    };



    wrapperConfig = mkOption {

      type = types.attrs;

      default = {};

      description = mdDoc "Arguments to pass to Firefox wrapper";

    };



    policies = mkOption {

      type = policyFormat.type;

      default = { };
@@ -227,16 +233,22 @@ in 
        ] ++ optionals nmh.passff [

          passff-host

        ];

      })

    ];

        cfg = let

          # copy-pasted from the wrapper; TODO: figure out fix

          applicationName = cfg.package.binaryName or (lib.getName cfg.package);



    nixpkgs.config.firefox = {

          nixpkgsConfig = config.nixpkgs.config.${applicationName} or {};

          optionConfig = cfg.wrapperConfig;

          nmhConfig = {

            enableBrowserpass = nmh.browserpass;

            enableBukubrow = nmh.bukubrow;

            enableTridactylNative = nmh.tridactyl;

            enableUgetIntegrator = nmh.ugetIntegrator;

            enableFXCastBridge = nmh.fxCast;

          };

        in nixpkgsConfig // optionConfig // nmhConfig;

      })

    ];



    environment.etc =

      let

nixos/modules/services/desktops/gnome/gnome-browser-connector.nix

+1 −1
Original line number Diff line number Diff line
@@ -42,6 +42,6 @@ in 


    services.dbus.packages = [ pkgs.gnome-browser-connector ];



    nixpkgs.config.firefox.enableGnomeExtensions = true;

    programs.firefox.wrapperConfig.enableGnomeExtensions = true;

  };

}

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

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ in 
      # Update the start menu for each user that is currently logged in

      system.userActivationScripts.plasmaSetup = activationScript;



      nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;

      programs.firefox.wrapperConfig.enablePlasmaBrowserIntegration = true;

    })



    (mkIf (cfg.kwinrc != {}) {