diff options
Diffstat (limited to 'hm/soispha/conf/firefox')
5 files changed, 16 insertions, 80 deletions
diff --git a/hm/soispha/conf/firefox/config/extensions/extensions.json b/hm/soispha/conf/firefox/config/extensions/extensions.json index aa92c9e3..11cdb288 100644 --- a/hm/soispha/conf/firefox/config/extensions/extensions.json +++ b/hm/soispha/conf/firefox/config/extensions/extensions.json @@ -46,13 +46,5 @@ "sha256": "sha256:7d40f924808202161a03863a6775f469674c344b4079ff77e3f8c149aa41323d", "url": "https://addons.mozilla.org/firefox/downloads/file/4186145/vhack_libredirect-2.8.3.xpi", "version": "2.8.3" - }, - "video-pause": { - "addonId": "video-pauser@addons.vhack.eu", - "default_area": "menupanel", - "pname": "video-pause", - "sha256": "sha256:be003d3a248070327f12e72f198057f9a5d6fc06bb637e23948104a6dffe676f", - "url": "https://addons.mozilla.org/firefox/downloads/file/4186404/video_pause-1.0.3.xpi", - "version": "1.0.3" } } diff --git a/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/default.nix b/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/default.nix index e0ee1dfa..9aaa1682 100644 --- a/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/default.nix +++ b/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/default.nix @@ -1,24 +1,15 @@ -{ - pkgs, - video_pause, - ... -}: let - video_pause_ext = import ./video-pause.nix {inherit pkgs video_pause;}; -in - /* - ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) - ++ lib.optional (cfg.enableBukubrow or false) bukubrow - ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native - ++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector - ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator - ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration - ++ lib.optional (cfg.enableFXCastBridge or false) fx-cast-bridge - ++ lib.optional (cfg.enableKeePassXC or false) keepassxc - - - */ - with pkgs; [ - video_pause_ext - tridactyl-native - keepassxc - ] +{pkgs, ...}: +/* +++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) +++ lib.optional (cfg.enableBukubrow or false) bukubrow +++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native +++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector +++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator +++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration +++ lib.optional (cfg.enableFXCastBridge or false) fx-cast-bridge +++ lib.optional (cfg.enableKeePassXC or false) keepassxc +*/ +with pkgs; [ + tridactyl-native + keepassxc +] diff --git a/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/video-pause.nix b/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/video-pause.nix deleted file mode 100644 index 300d296c..00000000 --- a/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/video-pause.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - pkgs, - video_pause, - ... -}: let - extensions = builtins.fromJSON (builtins.readFile ../extensions.json); - inherit (extensions) video-pause; -in - /* - mkdir -p $out/lib/mozilla/native-messaging-hosts - for ext in ${toString nativeMessagingHosts}; do - ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/* - done - */ - pkgs.stdenv.mkDerivation { - inherit (video-pause) pname version; - - dontUnpack = true; - buildPhase = '' - mkdir -p $out/share/ - cat << EOF > $out/share/"${video-pause.pname}".json - { - "name": "video.pause", - "description": "Stop a video with a native hotkey", - "path": "${video_pause}/bin/video-pause", - "type": "stdio", - "allowed_extensions": ["${video-pause.addonId}"] - } - EOF - - nmp="$(mktemp)"; - cat << EOF > "$nmp" - lib/mozilla/native-messaging-hosts - lib/librewolf/native-messaging-hosts - etc/opt/chrome/native-messaging-hosts - etc/chromium/native-messaging-hosts - etc/vivaldi/native-messaging-hosts - EOF - - while read -r path; do - mkdir -p $out/$path; - cp $out/share/"${video-pause.pname}".json $out/$path/ - done < "$nmp" - ''; - } diff --git a/hm/soispha/conf/firefox/default.nix b/hm/soispha/conf/firefox/default.nix index 0c929633..c8e0e2d9 100644 --- a/hm/soispha/conf/firefox/default.nix +++ b/hm/soispha/conf/firefox/default.nix @@ -3,7 +3,6 @@ pkgs, lib, user_js, - video_pause, ... }: let extensions = @@ -19,7 +18,7 @@ }; engines = (import ./config/search/engines) {inherit pkgs;}; - native_messaging_hosts = (import ./config/extensions/native_messaging_hosts/default.nix) {inherit pkgs video_pause;}; + native_messaging_hosts = (import ./config/extensions/native_messaging_hosts/default.nix) {inherit pkgs;}; policies = (import ./config/policies) {inherit config extensions;}; diff --git a/hm/soispha/conf/firefox/scripts/update_extensions.sh b/hm/soispha/conf/firefox/scripts/update_extensions.sh index 83b0146d..49e9e407 100755 --- a/hm/soispha/conf/firefox/scripts/update_extensions.sh +++ b/hm/soispha/conf/firefox/scripts/update_extensions.sh @@ -8,7 +8,6 @@ cat <<EOF >"$tmp" torproject-snowflake:navbar tridactyl-vim:menupanel ublock-origin:menupanel - video-pause:menupanel EOF # The bin is provided in the devshell; |