From 4d90d5cbf0986c0f1bfda785b2dd2af642275fff Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 15 Oct 2024 14:40:17 -0400 Subject: [PATCH] qutebrowser: drop No real reason to use qutebrowser now that I've written new-tab-identity and have LibreWolf programmed declaratively. The additional complexity of having another browser installed meant that I had to deal with a pyqt6 build error for an application I rarely used for a number of reasons (no https by default etc.) --- home/fish.nix | 27 --------- home/ironbar.nix | 2 +- home/mime-apps.nix | 2 +- home/qutebrowser.nix | 139 ------------------------------------------- 4 files changed, 2 insertions(+), 168 deletions(-) delete mode 100644 home/qutebrowser.nix diff --git a/home/fish.nix b/home/fish.nix index 5f626b3f..b149a949 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -152,33 +152,6 @@ echo "Done. Reduced file size from $ORIGINAL_SIZE to $NEW_SIZE" ''; - tmp = # fish - '' - set MULLVAD_CACHE "/tmp/mullvad.json" - - if not test -e $MULLVAD_CACHE - curl https://api.mullvad.net/www/relays/wireguard > $MULLVAD_CACHE - end - - set CONTAINER_PROXY (random choice (cat $MULLVAD_CACHE | jq -r '.[] | select(.active) | select(.hostname | startswith("jp")) | .socks_name')) - set CONTAINER_ID "qtb-$(uuidgen)" - set SHORT (string split "." "$CONTAINER_PROXY" -f 1) - - mkdir -p "/tmp/$CONTAINER_ID/config/bookmarks" - mkdir -p "/tmp/$CONTAINER_ID/data/userscripts" - - ln -s ~/.config/qutebrowser/bookmarks/urls "/tmp/$CONTAINER_ID/config/bookmarks/urls" - ln -s ~/.config/qutebrowser/quickmarks "/tmp/$CONTAINER_ID/config/quickmarks" - - TZ="Asia/Tokyo" lnch qutebrowser \ - --set content.proxy "socks5://$CONTAINER_PROXY:1080" \ - --set window.title_format "{perc}[$SHORT]{title_sep}{current_title}" \ - --basedir "/tmp/$CONTAINER_ID" \ - --config-py "$HOME/.config/qutebrowser/config.py" \ - :adblock-update \ - "$argv" - ''; - ex = # fish '' if string match -qe -- ".part1." "$argv"; diff --git a/home/ironbar.nix b/home/ironbar.nix index 195670a3..e5327462 100644 --- a/home/ironbar.nix +++ b/home/ironbar.nix @@ -57,7 +57,7 @@ in "librewolf" "kitty" "thunar" - "org.qutebrowser.qutebrowser" + "Chromium-browser" "anki" ]; }; diff --git a/home/mime-apps.nix b/home/mime-apps.nix index 499c8f4d..21fabbdd 100644 --- a/home/mime-apps.nix +++ b/home/mime-apps.nix @@ -8,7 +8,7 @@ "text/plain" = "nvim.desktop"; "image/png" = "pqiv.desktop"; "image/jpeg" = "pqiv.desktop"; - "image/gif" = "org.qutebrowser.qutebrowser.desktop"; + "image/gif" = "pqiv.desktop"; "application/pdf" = "org.pwmt.zathura-pdf-mupdf.desktop"; "application/x-wine-extension-osz" = "osu-stable.desktop"; "x-scheme-handler/http" = "librewolf.desktop"; diff --git a/home/qutebrowser.nix b/home/qutebrowser.nix deleted file mode 100644 index fa280caf..00000000 --- a/home/qutebrowser.nix +++ /dev/null @@ -1,139 +0,0 @@ -{ config, ... }: - -let - inherit (config.xdg.userDirs) download; -in -{ - programs.qutebrowser = { - enable = true; - - settings = { - url = { - start_pages = [ "about:blank" ]; - default_page = "about:blank"; - }; - - colors.webpage.darkmode.enabled = false; - - confirm_quit = [ - "multiple-tabs" - "downloads" - ]; - - session.lazy_restore = true; - - tabs = { - show = "multiple"; - mousewheel_switching = false; - last_close = "close"; - new_position.unrelated = "next"; - }; - - content = { - persistent_storage = true; - notifications.enabled = true; - register_protocol_handler = true; - mute = true; - headers.accept_language = "ja,en-US;q=0.9,en;q=0.8"; - }; - - fileselect = { - handler = "external"; - - folder.command = [ - "kitty" - "-e" - "yazi" - "--cwd-file" - "{}" - ]; - - multiple_files.command = [ - "kitty" - "-e" - "yazi" - "--chooser-file" - "{}" - ]; - - single_file.command = [ - "kitty" - "-e" - "yazi" - "--chooser-file" - "{}" - ]; - }; - - downloads = { - location = { - directory = download; - prompt = false; - }; - - position = "bottom"; - remove_finished = 5000; - }; - - qt = { - args = [ - "disable-backing-store-limit" - "enable-accelerated-video-decode" - "disable-gpu-driver-bug-workarounds" - ]; - - chromium.low_end_device_mode = "never"; - }; - - editor.command = [ - "kitty" - "-e" - "nvim" - "{}" - ]; - }; - - keyBindings = { - normal = { - d = "scroll-page 0 0.5"; - u = "scroll-page 0 -0.5"; - D = "scroll-page 0 0.5"; - U = "scroll-page 0 -0.5"; - "" = "back"; - "" = "forward"; - "" = "tab-prev"; - "" = "tab-next"; - J = "tab-prev"; - K = "tab-next"; - "" = "devtools"; - zb = "bookmark-del"; - x = "tab-close"; - X = "undo"; - st = "config-cycle tabs.show multiple switching"; - sTh = "set tabs.position left"; - sTj = "set tabs.position bottom"; - sTk = "set tabs.position top"; - sTl = "set tabs.position right"; - - pp = null; - pP = null; - Pp = null; - PP = null; - wp = null; - wP = null; - }; - }; - - searchEngines = { - DEFAULT = "https://search.goo.ne.jp/web.jsp?MT={}"; - }; - - extraConfig = # python - '' - from qutebrowser.mainwindow import tabwidget - - tabwidget.TabWidget.MUTE_STRING = "" - tabwidget.TabWidget.AUDIBLE_STRING = "[A]" - ''; - }; -}