From 09427890e5e463f5a17298d04122aff5e1d86279 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sat, 6 Jan 2024 02:49:02 +0100 Subject: [PATCH] qutebrowser: Drop It had been nice while it lasted, but the general usability of LibreWolf is better. --- users/simon/modules/default.nix | 1 - users/simon/modules/qutebrowser/default.nix | 308 ------------------ .../userscripts/bandcamp-volume.user.js | 30 -- .../userscripts/better-nginx-index.user.js | 53 --- .../qutebrowser/userscripts/invidious.user.js | 10 - .../qutebrowser/userscripts/libreddit.user.js | 9 - .../qutebrowser/userscripts/nitter.user.js | 8 - .../userscripts/per-domain-userstyles.user.js | 16 - .../qutebrowser/userstyles/monospace.scss | 22 -- 9 files changed, 457 deletions(-) delete mode 100644 users/simon/modules/qutebrowser/default.nix delete mode 100644 users/simon/modules/qutebrowser/userscripts/bandcamp-volume.user.js delete mode 100644 users/simon/modules/qutebrowser/userscripts/better-nginx-index.user.js delete mode 100644 users/simon/modules/qutebrowser/userscripts/invidious.user.js delete mode 100644 users/simon/modules/qutebrowser/userscripts/libreddit.user.js delete mode 100644 users/simon/modules/qutebrowser/userscripts/nitter.user.js delete mode 100644 users/simon/modules/qutebrowser/userscripts/per-domain-userstyles.user.js delete mode 100644 users/simon/modules/qutebrowser/userstyles/monospace.scss diff --git a/users/simon/modules/default.nix b/users/simon/modules/default.nix index be44fc8..89f346f 100644 --- a/users/simon/modules/default.nix +++ b/users/simon/modules/default.nix @@ -20,7 +20,6 @@ ./neovim ./pass.nix ./programs.nix - ./qutebrowser ./scripts ./sway ./tmate.nix diff --git a/users/simon/modules/qutebrowser/default.nix b/users/simon/modules/qutebrowser/default.nix deleted file mode 100644 index 440cb22..0000000 --- a/users/simon/modules/qutebrowser/default.nix +++ /dev/null @@ -1,308 +0,0 @@ -{ config, lib, nixosConfig, pkgs, ... }: -let - inherit ((import ../common.nix).colorschemes) solarized; - - setOptionForeachPattern = option: value: patterns: - let - formatValue = value: - if lib.isBool value - then (if value then "True" else "False") - else - (if lib.isString value - then "r\"${value}\"" - else (toString value)); - in - lib.concatMapStringsSep - "\n" - (pattern: "config.set(\"${option}\", ${formatValue value}, \"${pattern}\")") - patterns; - - permissionVideo = [ - "https://chat.sbruder.de" - "https://meet.jalr.de" - ]; - permissionAudio = [ - ] ++ permissionVideo; # capturing video almost always also requires capturing audio - permissionNotifications = [ - "https://chat.sbruder.de" - ]; - - permissionAutoplay = [ - "https://iv.sbruder.xyz" - ]; - - cookieExceptions = [ - ]; -in -lib.mkIf nixosConfig.sbruder.gui.enable -{ - programs.qutebrowser = { - enable = true; - aliases = { - q = "tab-close"; # one tab - qa = "close"; # one window - "qa!" = "quit"; # everything - }; - keyBindings = { - normal = { - ",rm" = "spawn -u readability"; - - # reasonable tab cycling - J = "tab-prev"; - K = "tab-next"; - gJ = "tab-move -"; - gK = "tab-move +"; - - # mpv - ",mv" = "spawn mpv --profile=clear-speed {url}"; - ",ma" = "spawn mpv --player-operation-mode=pseudo-gui --ytdl-format=251/bestaudio/best {url}"; - ",mq" = "spawn umpv {url}"; - ",Mv" = "hint links spawn mpv --profile=clear-speed {hint-url}"; - ",Ma" = "hint links spawn mpv --player-operation-mode=pseudo-gui --ytdl-format=251/bestaudio/best {hint-url}"; - ",Mq" = "hint links spawn umpv {hint-url}"; - }; - }; - searchEngines = { - DEFAULT = "https://bangs.sbruder.de/eval?engine=https://duckduckgo.com/?q=%25s&query={}"; - }; - settings = { - colors = - let - fgbg = fg: bg: { inherit fg bg; }; - topbottom = colour: { top = colour; bottom = colour; }; - in - with solarized; { - completion = rec { - fg = base1; - odd.bg = base02; - even.bg = base03; - match.fg = green; - scrollbar = fgbg base1 base03; - category = { - inherit (fgbg yellow base03) fg bg; - border = topbottom base03; - }; - item.selected = { - inherit (fgbg base1 base01) fg bg; - border = topbottom base01; - inherit match; - }; - }; - contextmenu = { - disabled = fgbg base0 base02; - menu = fgbg base1 base03; - selected = fgbg base1 base01; - }; - downloads = { - bar.bg = base03; - start = fgbg base03 blue; - stop = fgbg base03 cyan; - error.fg = red; - }; - hints = { - inherit (fgbg base03 yellow) fg bg; - match.fg = base1; - }; - keyhint = { - inherit (fgbg base1 base03) fg bg; - suffix.fg = base1; - }; - messages = { - error = { - inherit (fgbg base03 red) fg bg; - border = red; - }; - warning = { - inherit (fgbg base03 violet) fg bg; - border = violet; - }; - info = { - inherit (fgbg base1 base03) fg bg; - border = base03; - }; - }; - prompts = { - inherit (fgbg base1 base03) fg bg; - border = base03; - selected = fgbg base1 base01; - }; - statusbar = { - normal = fgbg green base03; - insert = fgbg base03 blue; - passthrough = fgbg base03 cyan; - private = fgbg base03 base02; - command = { - inherit (fgbg base1 base03) fg bg; - private = fgbg base1 base03; - }; - caret = { - inherit (fgbg base03 violet) fg bg; - selection = fgbg base03 blue; - }; - progress.bg = blue; - url.fg = base1; - url.error.fg = red; - url.hover.fg = base1; - url.success.http.fg = cyan; - url.success.https.fg = green; - url.warn.fg = violet; - }; - - tabs = rec { - bar.bg = base03; - even = fgbg base1 base03; - odd = even; - indicator = { - start = blue; - stop = cyan; - error = red; - }; - selected = rec { - even = fgbg base02 green; - odd = even; - }; - pinned = { - inherit even odd selected; - }; - }; - }; - - # UI - scrolling.smooth = true; - completion.web_history.max_items = 0; # no history - - # Fonts - fonts = { - web = { - family = rec { - serif = "Georgia"; - sans_serif = "PT Sans"; - standard = sans_serif; - }; - }; - }; - - # Behaviour - auto_save.session = true; - session.lazy_restore = true; - content.autoplay = false; - downloads = { - location.directory = "/tmp"; - open_dispatcher = "${pkgs.xdg-utils}/bin/xdg-open"; # QDesktopServices.openUrl always opens Firefox - }; - editor.command = [ "foot" "-e" "nvim" "-f" "{file}" "-c" "normal {line}G{column0}l" ]; - spellcheck.languages = [ "de-DE" "en-GB" ]; - url.default_page = "about:blank"; - url.start_pages = [ "about:blank" ]; - - # Privacy - content.cookies.accept = "no-3rdparty"; - content.headers.accept_language = "en-US,en;q=0.5"; - - # Filtering (many don’t get used yet due to lack of cosmetic filtering) - # https://github.com/gorhill/uBlock/blob/master/assets/assets.json - # EasyList is using a mirror because upstream’s servers are slow - content.blocking.adblock.lists = [ - "https://secure.fanboy.co.nz/easylist.txt" - "https://secure.fanboy.co.nz/easyprivacy.txt" - "https://secure.fanboy.co.nz/fanboy-social.txt" - "https://easylist-downloads.adblockplus.org/easylistgermany.txt" - "https://filters.adtidy.org/extension/ublock/filters/17.txt" - "https://filters.adtidy.org/extension/ublock/filters/3.txt" - "https://filters.adtidy.org/extension/ublock/filters/4.txt" - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/annoyances.txt" - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badlists.txt" - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt" - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt" - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/privacy.txt" - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt" - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/unbreak.txt" - "https://secure.fanboy.co.nz/fanboy-annoyance.txt" - "https://secure.fanboy.co.nz/fanboy-antifacebook.txt" - "https://secure.fanboy.co.nz/fanboy-cookiemonster.txt" - ]; - }; - extraConfig = /* python */ '' - import glob - - c.content.user_stylesheets = glob.glob("${config.xdg.configHome}/qutebrowser/userstyles/*.css") - - c.qt.environ = { - # otherwise results in severe banding (https://github.com/qutebrowser/qutebrowser/issues/5528) - "QT_WAYLAND_DISABLE_WINDOWDECORATION": "0", - } - - c.content.headers.custom = { - "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" - } - - c.tabs.padding["top"] = 3 - c.tabs.padding["bottom"] = 3 - - # Permissions - ${setOptionForeachPattern "content.media.audio_capture" true permissionAudio} - ${setOptionForeachPattern "content.media.audio_video_capture" true permissionVideo} - ${setOptionForeachPattern "content.media.video_capture" true permissionVideo} - ${setOptionForeachPattern "content.notifications.enabled" true permissionNotifications} - - ${setOptionForeachPattern "content.autoplay" true permissionAutoplay} - - # Cookie exceptions - ${setOptionForeachPattern "content.cookies.accept" "all" cookieExceptions} - ''; - }; - - xdg.configFile = - let - replaceExtension = newExtension: filename: "${lib.concatStringsSep "." (lib.init (lib.splitString "." filename))}.${newExtension}"; - - regularFilesIn = dir: lib.filterAttrs - (_: v: v == "regular") - (builtins.readDir (./. + "/${dir}")); - - compileScss = name: file: pkgs.runCommand (replaceExtension "css" name) { } '' - ${pkgs.sassc}/bin/sassc ${file} $out - ''; - in - { - "qutebrowser/bookmarks/urls".source = config.lib.file.mkOutOfStoreSymlink "${config.xdg.dataHome}/qutebrowser/synced-bookmarks/bookmarks"; - "qutebrowser/quickmarks".source = config.lib.file.mkOutOfStoreSymlink "${config.xdg.dataHome}/qutebrowser/synced-bookmarks/quickmarks"; - } // (lib.mapAttrs' - (k: _: lib.nameValuePair "qutebrowser/greasemonkey/${k}" { source = ./userscripts + "/${k}"; }) - (regularFilesIn "userscripts")) // (lib.mapAttrs' - (k: _: lib.nameValuePair "qutebrowser/userstyles/${replaceExtension "css" k}" { source = compileScss k (./userstyles + "/${k}"); }) - (regularFilesIn "userstyles")); - - xdg.dataFile = lib.mapAttrs' - (dict: sha256: lib.nameValuePair - "qutebrowser/qtwebengine_dictionaries/${dict}.bdic" - { - source = (pkgs.fetchurl { - url = "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries/+/18e09b9197a3b1d771c077c530d1a4ebad04c167/${dict}.bdic?format=TEXT"; - inherit sha256; - postFetch = '' - base64 -d "$out" > "$TMPDIR/decoded" - mv "$TMPDIR/decoded" "$out" - ''; - }); - }) - { - "de-DE-3-0" = "sha256-B2pHBwDb0Kpiu4s9JMNOE0C9/oPLvPwDXOly8jwUBAA="; - "en-GB-9-0" = "sha256-c8eaQQ+AkgwpsFX3upB9k0A7BajBfQDo5wVO22L3Maw="; - }; - - home.packages = [ - (pkgs.writeShellScriptBin "qbmarks" /* bash */ '' - set -euo pipefail - - git() { - echo "[$] git $@" - command git -C "${config.xdg.dataHome}/qutebrowser/synced-bookmarks" "$@" - } - - git commit --no-gpg-sign -a -m "Sync on $(hostname)" || true - git pull --rebase --no-gpg-sign - git push - '') - ]; -} diff --git a/users/simon/modules/qutebrowser/userscripts/bandcamp-volume.user.js b/users/simon/modules/qutebrowser/userscripts/bandcamp-volume.user.js deleted file mode 100644 index 4e3070d..0000000 --- a/users/simon/modules/qutebrowser/userscripts/bandcamp-volume.user.js +++ /dev/null @@ -1,30 +0,0 @@ -// ==UserScript== -// @name Bandcamp: Add volume slider -// @include https://*.bandcamp.com/* -// @include https://sewerslvt.com/* -// @include https://store.sigurros.com/* -// ==/UserScript== -function setVolume(volume) { - document.querySelectorAll("audio").forEach(el => el.volume = volume / 100) - localStorage.setItem("volume", volume) -} - -function loadStoredVolume() { - return localStorage.getItem("volume") ? Number(localStorage.getItem("volume")) : 25 -} - -const volumeControlContainer = document.createElement("div") -volumeControlContainer.style.position = "fixed" -volumeControlContainer.style.top = 0 -volumeControlContainer.style.left = 0 -volumeControlContainer.style["z-index"] = 10000 -const volumeControlSlider = document.createElement("input") -volumeControlSlider.type = "range" -volumeControlSlider.min = 0 -volumeControlSlider.max = 100 -volumeControlSlider.value = loadStoredVolume() -volumeControlSlider.addEventListener("input", e => {setVolume(e.target.value)}) -volumeControlContainer.appendChild(volumeControlSlider) -document.body.appendChild(volumeControlContainer) - -setInterval(() => {setVolume(loadStoredVolume())}, 1000) diff --git a/users/simon/modules/qutebrowser/userscripts/better-nginx-index.user.js b/users/simon/modules/qutebrowser/userscripts/better-nginx-index.user.js deleted file mode 100644 index 4cb8eaa..0000000 --- a/users/simon/modules/qutebrowser/userscripts/better-nginx-index.user.js +++ /dev/null @@ -1,53 +0,0 @@ -// ==UserScript== -// @name nginx: Better directory index -// @include http://localhost:8888/torrent*/download/* -// @include https://ci.sbruder.de/nix-store/* -// ==/UserScript== - -// https://stackoverflow.com/a/14919494 -function humanFileSize(bytes) { - const thresh = 1024 - if(Math.abs(bytes) < thresh) { - return bytes + ' B' - } - const units = ['KiB','MiB','GiB','TiB','PiB','EiB','ZiB','YiB'] - var u = -1; - do { - bytes /= thresh; - ++u; - } while(Math.abs(bytes) >= thresh && u < units.length - 1); - return bytes.toFixed(1)+' '+units[u] -} - - -function textToA(line) { - let outerElement = document.createElement('div') - outerElement.innerHTML = line - return outerElement.getElementsByTagName('a')[0] -} - -function parseLine(line) { - const href = textToA(line).href - const filename = href.substr(-1) === '/' ? decodeURIComponent(href.split('/').slice(-2, -1)[0]) : decodeURIComponent(href.split('/').pop()) - const size = line.split(' ').pop() - return { - href: href, - filename: filename, - size: size - } -} - -function processLine(line) { - meta = parseLine(line) - return `${meta.filename}${meta.size === '-' ? '-' : humanFileSize(meta.size)}` -} - -const collator = new Intl.Collator('kn', {numeric: true}) - -document.querySelector('pre').outerHTML = '' + document.querySelector('pre').innerHTML - .split('\n') - .filter(line => line !== '') - .filter(line => line !== '../') - .map(processLine) - .sort(collator.compare) - .join('\n') + '
../-
' diff --git a/users/simon/modules/qutebrowser/userscripts/invidious.user.js b/users/simon/modules/qutebrowser/userscripts/invidious.user.js deleted file mode 100644 index d69d05c..0000000 --- a/users/simon/modules/qutebrowser/userscripts/invidious.user.js +++ /dev/null @@ -1,10 +0,0 @@ -// ==UserScript== -// @name Invidious Redirect -// @include http://www.youtube.com/* -// @include https://www.youtube.com/* -// @include https://www.youtube-nocookie.com/* -// @run-at document-start -// ==/UserScript== - -document.close(); -window.location.replace(window.location.href.replace(/www\.youtube(-nocookie)?\.com/, "iv.sbruder.xyz").replace("/shorts/", "/watch?v=")) diff --git a/users/simon/modules/qutebrowser/userscripts/libreddit.user.js b/users/simon/modules/qutebrowser/userscripts/libreddit.user.js deleted file mode 100644 index 9c4262a..0000000 --- a/users/simon/modules/qutebrowser/userscripts/libreddit.user.js +++ /dev/null @@ -1,9 +0,0 @@ -// ==UserScript== -// @name Libreddit Redirect -// @include https://www.reddit.com/* -// @include https://old.reddit.com/* -// @run-at document-start -// ==/UserScript== - -document.close(); -window.location.replace(window.location.href.replace(/(old|www)?\.reddit\.com/, "libreddit.sbruder.xyz")) diff --git a/users/simon/modules/qutebrowser/userscripts/nitter.user.js b/users/simon/modules/qutebrowser/userscripts/nitter.user.js deleted file mode 100644 index 53063ea..0000000 --- a/users/simon/modules/qutebrowser/userscripts/nitter.user.js +++ /dev/null @@ -1,8 +0,0 @@ -// ==UserScript== -// @name Nitter Redirect -// @include https://twitter.com/* -// @run-at document-start -// ==/UserScript== - -document.close(); -window.location.replace(window.location.href.replace(/twitter\.com/, "nitter.sbruder.xyz")) diff --git a/users/simon/modules/qutebrowser/userscripts/per-domain-userstyles.user.js b/users/simon/modules/qutebrowser/userscripts/per-domain-userstyles.user.js deleted file mode 100644 index 7615071..0000000 --- a/users/simon/modules/qutebrowser/userscripts/per-domain-userstyles.user.js +++ /dev/null @@ -1,16 +0,0 @@ -// ==UserScript== -// @name Per-Domain Userstyles -// @include * -// @run-at document-start -// @author Original by Olmo Kramer -// ==/UserScript== - -(() => { - document.addEventListener("readystatechange", () => { - if (document.readyState == "interactive") { - const doc = document.documentElement - doc.setAttribute("data-qb-url", window.location.href) - doc.setAttribute("data-qb-domain", window.location.host) - } - }) -})() diff --git a/users/simon/modules/qutebrowser/userstyles/monospace.scss b/users/simon/modules/qutebrowser/userstyles/monospace.scss deleted file mode 100644 index 268d8a9..0000000 --- a/users/simon/modules/qutebrowser/userstyles/monospace.scss +++ /dev/null @@ -1,22 +0,0 @@ -[data-qb-domain="pad.sbruder.de"] .CodeMirror { - font-family: monospace; -} - -[data-qb-domain="github.com"] { - code, - pre, - tt, - .blob-code-inner, - .text-mono { - font-family: monospace !important; - } -} - -[data-qb-domain="git.sbruder.de"] { - pre, - code, - kbd, - samp { - font-family: monospace !important; - } -}