chore(firefox): use regular nixgl wrapper
And remove `enableNixGL` configuration in related home configurations
This commit is contained in:
parent
40da37234a
commit
e446394b83
3 changed files with 2 additions and 27 deletions
|
@ -26,7 +26,6 @@
|
||||||
};
|
};
|
||||||
web.firefox = {
|
web.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableNixGL = true;
|
|
||||||
};
|
};
|
||||||
web.qutebrowser = {
|
web.qutebrowser = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
};
|
};
|
||||||
web.firefox = {
|
web.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableNixGL = true;
|
|
||||||
optionalExtensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
optionalExtensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||||
okta-browser-plugin
|
okta-browser-plugin
|
||||||
];
|
];
|
||||||
|
|
|
@ -29,11 +29,6 @@ in
|
||||||
description = "Optional Firefox Plugins to install";
|
description = "Optional Firefox Plugins to install";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableNixGL = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Use NixGL to start Firefox";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
programs.browserpass = {
|
programs.browserpass = {
|
||||||
|
@ -47,24 +42,6 @@ in
|
||||||
"x-scheme-handler/about" = "firefox.desktop";
|
"x-scheme-handler/about" = "firefox.desktop";
|
||||||
"x-scheme-handler/unknown" = "firefox.desktop";
|
"x-scheme-handler/unknown" = "firefox.desktop";
|
||||||
};
|
};
|
||||||
xdg.desktopEntries."firefox" = mkIf cfg.enableNixGL {
|
|
||||||
name = "Firefox NixGL Powered";
|
|
||||||
exec = "${pkgs.nixgl.nixGLMesa}/bin/nixGLMesa firefox %U";
|
|
||||||
icon = "firefox";
|
|
||||||
terminal = false;
|
|
||||||
type = "Application";
|
|
||||||
startupNotify = true;
|
|
||||||
actions = {
|
|
||||||
"new-private-window" = {
|
|
||||||
exec = "${pkgs.nixgl.nixGLMesa}/bin/nixGLMesa firefox --private-window %U";
|
|
||||||
name = "New Private Window";
|
|
||||||
};
|
|
||||||
"new-window" = {
|
|
||||||
exec = "${pkgs.nixgl.nixGLMesa}/bin/nixGLMesa firefox --new-window %U";
|
|
||||||
name = "New Window";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
xdg.configFile."tridactyl/tridactylrc".text = ''
|
xdg.configFile."tridactyl/tridactylrc".text = ''
|
||||||
sanitize tridactyllocal tridactylsync
|
sanitize tridactyllocal tridactylsync
|
||||||
|
@ -93,13 +70,13 @@ in
|
||||||
allExtensions = cfg.baseExtensions ++ cfg.optionalExtensions;
|
allExtensions = cfg.baseExtensions ++ cfg.optionalExtensions;
|
||||||
in {
|
in {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
|
package = config.lib.nixGL.wrap ( pkgs.wrapFirefox pkgs.firefox-unwrapped {
|
||||||
nativeMessagingHosts = [
|
nativeMessagingHosts = [
|
||||||
# Tridactyl native connector
|
# Tridactyl native connector
|
||||||
pkgs.tridactyl-native
|
pkgs.tridactyl-native
|
||||||
pkgs.browserpass
|
pkgs.browserpass
|
||||||
];
|
];
|
||||||
};
|
});
|
||||||
profiles.ephase = {
|
profiles.ephase = {
|
||||||
id = 0;
|
id = 0;
|
||||||
name = "ephase";
|
name = "ephase";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue