From 76ecb13a1540a62a6e84f80a3c91cfb90ce4297c Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Fri, 4 Feb 2022 13:17:39 -0500
Subject: [PATCH] qute: change colors and finally whitelist js

---
 bin/aliases                                |  6 ++--
 bin/optiall                                |  2 ++
 bin/setup                                  | 39 +++++++++-------------
 fish/config.fish                           |  1 -
 qutebrowser/{config => }/adblock.py        |  0
 qutebrowser/{config => }/bindings.py       |  4 ++-
 qutebrowser/{config/adapta.py => color.py} | 20 ++++++-----
 qutebrowser/config.py                      | 15 ++++-----
 qutebrowser/greasemonkey/ao3.js            | 16 ---------
 qutebrowser/greasemonkey/discord.js        | 23 -------------
 qutebrowser/greasemonkey/hnews.js          | 17 ----------
 qutebrowser/greasemonkey/twitch.js         |  6 ----
 qutebrowser/greasemonkey/white.js          | 11 ------
 qutebrowser/javascript.py                  | 15 +++++++++
 qutebrowser/{config => }/redirects.py      |  4 ++-
 qutebrowser/user.css                       | 23 +++++++++++++
 16 files changed, 85 insertions(+), 117 deletions(-)
 rename qutebrowser/{config => }/adblock.py (100%)
 rename qutebrowser/{config => }/bindings.py (78%)
 rename qutebrowser/{config/adapta.py => color.py} (76%)
 delete mode 100644 qutebrowser/greasemonkey/ao3.js
 delete mode 100644 qutebrowser/greasemonkey/discord.js
 delete mode 100644 qutebrowser/greasemonkey/hnews.js
 delete mode 100644 qutebrowser/greasemonkey/twitch.js
 delete mode 100644 qutebrowser/greasemonkey/white.js
 create mode 100644 qutebrowser/javascript.py
 rename qutebrowser/{config => }/redirects.py (87%)
 create mode 100644 qutebrowser/user.css

diff --git a/bin/aliases b/bin/aliases
index 52d3eab..055fd6e 100755
--- a/bin/aliases
+++ b/bin/aliases
@@ -5,7 +5,7 @@ set -U fish_features 3.0
 a acmus 'timeout --foreground (math 3600 - (date +%s) % 3600) mpv --loop https://acmusicext.com/static/$argv/sunny/(date +%-I%p|tr APM apm).ogg'
 a aliases 'v (env which aliases); command aliases'
 a all2jxl 'fd -e{png,jpg} -x cjxl -e 8 -d 0 {} {.}.jxl && fd -e{png,jpg} -x rm'
-a ao3 'grep epub $argv | cut -d\" -f4 | parallel aria2c "https://ao3.org{}" -dao3;rm'
+a ao3 'grep -Eo works/[0-9]+ $argv | uniq | tr -d a-z | parallel aria2c "https://ao3.org/downloads{}/\*.epub" -d ao3; rm'
 a base64d 'echo (echo $argv | base64 -d 2>/dev/null) | tee /dev/stderr 2>| clip;:'
 a bax 'source (which bax) && bax'
 a catbox 'curl https://catbox.moe/user/api.php -F reqtype=fileupload -F fileToUpload=@$argv;:'
@@ -26,6 +26,7 @@ a launcher 'rofi -combi-modi "drun,run" -show combi -modi "combi,window"'
 a less 'eval $PAGER'
 a listen 'pactl list | grep loop && set t un; pactl "$t"load-module module-loopback'
 a musikcube 'screen -R -s musikcube'
+a ncdu 'ncdu --color off'
 a nix 'bax . ~/.nix-profile/etc/profile.d/nix.sh; command nix'
 a off shutdown
 a offh 'off (math "60*"$argv);:'
@@ -43,6 +44,7 @@ a spleet 'spleeter separate -o . -c flac'
 a tar bsdtar
 a tcsv 'curl -sL http://torrents-csv.ml/service/search?q="$argv"|jq ".[]|.name,.infohash,.seeders";:'
 a temp 'curl temp.sh -T'
+a tldrl 'curl -s https://raw.githubusercontent.com/tldr-pages/tldr/master/pages/{common,linux}/$argv.md;:'
 a transfer 'curl https://transfer.sh/(basename $argv) -T'
 a twitch-dl 'ffmpeg -i (yt-dlp -e $argv[1]|tr / _) -c copy $argv[2..-1] "file:(yt-dlp -g $argv[1]).mkv"'
 a up 'se up --y'
@@ -66,6 +68,6 @@ for i in (cat ~/.config/qutebrowser/quickmarks | cut -d ' ' -f1)
     a $i "qb \":open -t $i\""
 end
 
-for i in getnative mcross nsz scdl spleeter thonny
+for i in deemix nsz scdl soundscrape spleeter
     a $i "pipx run $i"
 end
diff --git a/bin/optiall b/bin/optiall
index 5415fda..37c46cf 100755
--- a/bin/optiall
+++ b/bin/optiall
@@ -12,3 +12,5 @@ fd -t f -x advdef -z2
 
 fd -e mp3 -x mp3packer
 fd -e mp3 -x rename -- -vbr ''
+
+fd -e so -x strip
diff --git a/bin/setup b/bin/setup
index d4d28a2..9128d64 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,38 +1,34 @@
 #!/bin/bash
-alias s=sudo se="sudo eopkg -y" g=git
+alias s=sudo se="s eopkg -y" g=git
 
 gnome="$(echo eog file-roller gnome-{photos,mpv,terminal} nautilus rhythmbox)"
-audio="audacious audacious-plugins audacity opus-tools spek"
-dev="ccache docker-compose git-extras llvm-clang neovim parallel qt-creator solbuild tig upx"
-gui="abiword caja gmic-gimp engrampa keepassxc kitty lutris"
-media="avidemux gaupol jpegoptim mkvtoolnix mpv playerctl usbmuxd viewnior yt-dlp zathura-poppler"
-rice="ant-dracula-gtk-theme font-ubuntu-ttf rofi starship stow"
-term="advancecomp autojump fd fish fzf innoextract micro most ncdu nnn p7zip ripgrep tmux"
-sys="bleachbit corectrl ifuse linux-tools-cpupower python-wheel rsync screen tlp"
-web="arcanist aria2 nicotine-plus qutebrowser openssh-server rclone subliminal syncthing-gtk"
-
-se up 
-se it -c system.devel $audio $dev $gui $media $rice $sys $term $web
 se rm $gnome firefox hexchat libreoffice-common onboard thunderbird
 
-echo source ~/.config/bashrc > ~/.bashrc
-ln -s ~/.config/gtk-3.0/gtkrc ~/.gtkrc-2.0
-install -D <(echo set -g mouse on) ~/.config/tmux/tmux.conf
+audio="audacious audacious-plugins audacity opus-tools spek"
+dev="ccache docker-compose git-extras llvm-clang neovim parallel qt-creator solbuild"
+gui="abiword caja gmic-gimp engrampa keepassxc kitty lutris zathura-poppler"
+media="avidemux gaupol jpegoptim mkvtoolnix mpv playerctl usbmuxd viewnior yt-dlp"
+rice="ant-dracula-gtk-theme font-ubuntu-ttf rofi starship stow"
+term="advancecomp autojump fd fish fzf innoextract micro most ncdu p7zip ripgrep tig"
+sys="bleachbit corectrl ifuse linux-tools-cpupower python-wheel rsync screen tlp upx"
+web="arcanist aria2 nicotine-plus qutebrowser openssh-server subliminal syncthing-gtk"
+se up; se it -c system.devel $audio $dev $gui $media $rice $sys $term $web
 
-mkdir -p ~/.parallel/will-cite
 stow --no-folding -d ~/.dotfiles -t ~/.config .
 stow --no-folding -d ~/.dotfiles -t ~/.local/bin bin
-
+mkdir -p ~/.parallel/will-cite
+echo source ~/.config/bashrc > ~/.bashrc
+ln -s ~/.config/gtk-3.0/gtkrc ~/.gtkrc-2.0
 
 un(){ F=$(mktemp); mkdir -p $2; curl https://api.github.com/repos/$1/releases |\
       grep -om1 http.\*zip | wget -i- -O$F; unzip $F -d $2;}
 un bloc97/Anime4k ~/.config/mpv/shaders
 un mozilla/pdf.js ~/.local/share/qutebrowser/pdfjs
 wget https://adsbypasser.github.io/releases/adsbypasser.full.es7.user.js -P ~/.config/qutebrowser/greasemonkey/
+pip3 install adblock pipx-in-pipx readability-lxml
 
-pip3 install adblock pipx-in-pipx readability-lxml sh
-parallel pipx install ::: deemix soundscrape tldr
-
+chsh -s "$(which fish)"
+fish -c "aliases;clean"
 s usermod -aG docker $USER
 s systemctl enable --now docker
 s systemctl mask tracker-{store,miner-{fs,rss,apps},extra,writeback}
@@ -44,9 +40,6 @@ g g p:haiku-icons ~/.local/share/icons/Haiku
 g g h:junegunn/vim-plug ~/.config/nvim/autoload
 nvim +PlugUpdate +q +q
 
-chsh -s $(which fish)
-fish -c "aliases;clean"
-
 gsettings set org.gnome.desktop.interface cursor-theme Haiku
 gsettings set org.gnome.desktop.interface icon-theme Haiku
 gsettings set org.gnome.desktop.interface gtk-theme Ant-Dracula
diff --git a/fish/config.fish b/fish/config.fish
index caba92b..5cf8c59 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -22,7 +22,6 @@ if tty -s
     set fish_color_valid_path --underline
     set fish_pager_color_prefix 'white'  '--bold'  '--underline'
 
-    bind \eo 'nnn'
     bind \ed 'ncdu'
     bind \ef 'fzf | clip'
 
diff --git a/qutebrowser/config/adblock.py b/qutebrowser/adblock.py
similarity index 100%
rename from qutebrowser/config/adblock.py
rename to qutebrowser/adblock.py
diff --git a/qutebrowser/config/bindings.py b/qutebrowser/bindings.py
similarity index 78%
rename from qutebrowser/config/bindings.py
rename to qutebrowser/bindings.py
index b800559..0648df8 100644
--- a/qutebrowser/config/bindings.py
+++ b/qutebrowser/bindings.py
@@ -4,6 +4,7 @@ bind = {
     '<Ctrl-w>': 'tab-close',
     '<Alt+f>' : 'config-cycle hints.chars qwerasdf asdfghjkl',
     ',': 'hint links run mpv {hint-url}',
+    'e': 'config-cycle -p -u *://*.{url:host}/* content.javascript.enabled ;; reload',
     'm': 'mpv {url}',
     's1': 'download-open',
     'sa': 'open -t archive.is/?run=1&url={url}',
@@ -13,7 +14,8 @@ bind = {
     'sq': 'spawn -u qr',
     'sr': 'remove-sticky',
     'st': 'config-cycle content.proxy socks://localhost:9050/ system',
-    'T' : 'tab-next'
+    'T' : 'tab-next',
+    'td': 'config-unset -u {url:host} content.headers.user_agent',
 }
 for a, b in bind.items():
     config.bind(a, b)
diff --git a/qutebrowser/config/adapta.py b/qutebrowser/color.py
similarity index 76%
rename from qutebrowser/config/adapta.py
rename to qutebrowser/color.py
index 6f8f721..36b0f97 100644
--- a/qutebrowser/config/adapta.py
+++ b/qutebrowser/color.py
@@ -2,9 +2,15 @@ cc  = c.colors
 ccc = cc.completion
 cct = cc.tabs
 
-guicol = '#222D32'
-accent = '#5294E2'
+#dracula
+guinum = 0x282a36
+accent = '#bd93f9'
 
+#adapta
+#guinum = 0x222d32
+#accent = '#5294e2'
+
+guicol = '#' + hex(guinum).lstrip("0x")
 cc.downloads.bar.bg             = guicol
 cc.prompts.bg                   = guicol
 cc.statusbar.command.bg         = guicol
@@ -18,6 +24,8 @@ cct.even.bg                     = guicol
 cct.odd.bg                      = guicol
 cct.pinned.even.bg              = guicol
 cct.pinned.odd.bg               = guicol
+ccc.even.bg                     = '#' + hex(guinum + 0x050505).lstrip("0x")
+ccc.odd.bg                      = '#' + hex(guinum - 0x050505).lstrip("0x")
 
 ccc.item.selected.bg            = accent
 ccc.item.selected.border.bottom = accent
@@ -28,16 +36,12 @@ cct.pinned.selected.even.bg     = accent
 cct.pinned.selected.odd.bg      = accent
 cct.selected.even.bg            = accent
 cct.selected.odd.bg             = accent
+c.hints.border                  = accent
+cc.hints.bg                     = accent
 
-cc.messages.warning.fg          = 'white'
 cct.pinned.selected.even.fg     = 'black'
 cct.pinned.selected.odd.fg      = 'black'
 cct.selected.even.fg            = 'black'
 cct.selected.odd.fg             = 'black'
-
 cc.messages.warning.bg          = 'red'
 cc.messages.warning.border      = 'red'
-ccc.even.bg                     = '#29353B'
-ccc.odd.bg                      = '#243035'
-c.hints.border                  = '1px solid #00A5BA'
-cc.hints.bg                     = 'rgba(0, 226, 255, 0.8)'
diff --git a/qutebrowser/config.py b/qutebrowser/config.py
index 6fb7210..02bf922 100644
--- a/qutebrowser/config.py
+++ b/qutebrowser/config.py
@@ -1,8 +1,9 @@
 config.load_autoconfig(False)
-config.source('config/adapta.py')
-config.source('config/adblock.py')
-config.source('config/bindings.py')
-config.source('config/redirects.py')
+config.source('color.py')
+config.source('adblock.py')
+config.source('bindings.py')
+config.source('javascript.py')
+config.source('redirects.py')
 
 c.url.default_page = 'feedly.com/i/my'
 c.url.start_pages = 'covid19.rpi.edu/dailycheckin'
@@ -15,6 +16,7 @@ c.colors.webpage.darkmode.enabled = True
 c.tabs.show = 'multiple'
 c.confirm_quit = ['downloads']
 c.qt.force_platformtheme = 'gtk2'
+c.content.user_stylesheets = 'user.css'
 c.content.cookies.accept = 'no-3rdparty'
 c.colors.webpage.preferred_color_scheme = 'dark'
 c.colors.webpage.darkmode.policy.images = 'never'
@@ -22,7 +24,7 @@ c.colors.webpage.darkmode.policy.images = 'never'
 c.aliases['re'] = 'restart'
 c.aliases['mpv'] = 'spawn -mdv mpv --ytdl-raw-options=sub-lang=en'
 c.aliases['remove-sticky'] = 'jseval -q document.querySelectorAll("*").forEach(e=>{["sticky","fixed"].includes(getComputedStyle(e).position)&&e.parentNode.removeChild(e)})'
-c.aliases['toggle-dark'] = 'reload;; jseval -qf ~/.config/qutebrowser/greasemonkey/white.js;; stop'
+c.aliases['toggle-dark'] = 'reload;;jseval -q const meta=document.createElement("meta");meta.name="color-scheme";document.head.appendChild(meta).content="dark";;stop'
 
 config.set('content.notifications.enabled', True, 'https://mail.tutanota.com')
 config.set('content.register_protocol_handler', True, 'https://mail.tutanota.com')
@@ -31,6 +33,3 @@ import socket
 if socket.gethostname() == 'wheatley':
     c.zoom.default = 125
     c.qt.force_software_rendering = 'chromium'
-
-#import dracula.draw
-#dracula.draw.blood(c, {'spacing': {'vertical': 1,'horizontal': 0}})
diff --git a/qutebrowser/greasemonkey/ao3.js b/qutebrowser/greasemonkey/ao3.js
deleted file mode 100644
index 4f6708e..0000000
--- a/qutebrowser/greasemonkey/ao3.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// ==UserScript==
-// @name        AO3 Lazier
-// @include     https://archiveofourown.org/*
-// @version     3.0
-// ==/UserScript==
-document.querySelectorAll('li.blurb').forEach(b=>{
-    i=b.querySelector('.heading a').href.match(/[0-9]+/)
-    b.innerHTML += `<div class="actions">
-        <a style="position:absolute;right:7em;top:.5em"
-        href='/downloads/${i}/*.epub'>Download</a></div>`})
-
-b=document.createElement('a')
-c=document.getElementsByTagName('option')
-i=document.getElementsByClassName('chapter')[2]
-b.href = c[c.length-1].value
-i.parentElement.insertBefore(b, i).innerText = 'Latest Chapter →'
diff --git a/qutebrowser/greasemonkey/discord.js b/qutebrowser/greasemonkey/discord.js
deleted file mode 100644
index 942b595..0000000
--- a/qutebrowser/greasemonkey/discord.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// ==UserScript==
-// @name          DisClear
-// @homepage      https://github.com/birb-naise/discord-simple-clear
-// @include       https://*.discord.com/*
-// ==/UserScript==
-document.head.appendChild(document.createElement('style')).innerHTML=`
-.theme-dark, .theme-light {
-    --background-primary: transparent;
-    --background-secondary: transparent;
-    --background-secondary-alt: transparent;
-    --background-tertiary: transparent;
-    --background-floating: rgba(0, 0, 0, .6);
-    --channeltextarea-background: transparent;
-    --font-primary: "Ubuntu Mono";
-}
-
-.container-2cd8Mz, .searchBar-3TnChZ, .listItemWrapper-3d87LP,
-[aria-label="Help"], [aria-label="Inbox"], [aria-label="Send a gift"],
-[href="/store"], [href="/channels/@me"] {display: none}
-
-body {background: url(
-"https://cdn.discordapp.com/attachments/773556458234052608/929383713932992512/0dKbZO5-16-9.webp"
-)}`
diff --git a/qutebrowser/greasemonkey/hnews.js b/qutebrowser/greasemonkey/hnews.js
deleted file mode 100644
index bf023ec..0000000
--- a/qutebrowser/greasemonkey/hnews.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// ==UserScript==
-// @name            Hacker Blues
-// @include         https://news.ycombinator.com/*
-// ==/UserScript==
-document.head.appendChild(document.createElement('style')).innerHTML=`
-body  {
-    background: #2b3033 !important;
-    color: #f0ffff !important;
-}
-body > center > table[width="85%"] {
-    background: #212121 !important;
-    box-shadow:  0px 0px 30px 3px rgba(0, 0, 0, 0.2) !important;
-}
-td[bgcolor="#ff6600"] {
-    background: linear-gradient(to top, #45515b 0%, #4b5762 100%) !important;
-}`
-document.body.style.zoom=1.15;
diff --git a/qutebrowser/greasemonkey/twitch.js b/qutebrowser/greasemonkey/twitch.js
deleted file mode 100644
index ba8eac1..0000000
--- a/qutebrowser/greasemonkey/twitch.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// ==UserScript==
-// @name            BetterTTV
-// @include         https://www.twitch.tv/*
-// ==/UserScript==
-document.head.appendChild(document.createElement("script")).src=
-"https://cdn.betterttv.net/betterttv.js"
diff --git a/qutebrowser/greasemonkey/white.js b/qutebrowser/greasemonkey/white.js
deleted file mode 100644
index bfbbfa9..0000000
--- a/qutebrowser/greasemonkey/white.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// ==UserScript==
-// @name  WhiteList
-// @match https://archiveofourown.org/*
-// @match https://canary.discord.com/*
-// @match https://mail.tutanota.com/*
-// @match https://teddit.net/*
-// ==/UserScript==
-const meta = document.createElement('meta');
-meta.name = "color-scheme";
-meta.content = "dark light";
-document.head.appendChild(meta);
diff --git a/qutebrowser/javascript.py b/qutebrowser/javascript.py
new file mode 100644
index 0000000..f6e7aba
--- /dev/null
+++ b/qutebrowser/javascript.py
@@ -0,0 +1,15 @@
+c.content.javascript.enabled = False
+sites = [
+        'canary.discord.com',
+        'drive.google.com',
+        'duckduckgo.com',
+        'feedly.com',
+        'mail.tutanota.com',
+
+        '*.rpi.edu',
+        'api-3e0243bb.duosecurity.com',
+        ]
+for site in sites:
+    config.set('content.javascript.enabled', True, 'https://' + site)
+
+config.set('content.headers.user_agent', 'iPhone', 'docs.google.com')
diff --git a/qutebrowser/config/redirects.py b/qutebrowser/redirects.py
similarity index 87%
rename from qutebrowser/config/redirects.py
rename to qutebrowser/redirects.py
index b15c3d4..1d282a1 100644
--- a/qutebrowser/config/redirects.py
+++ b/qutebrowser/redirects.py
@@ -24,7 +24,9 @@ MAP = {
         "www.instagram.com": o(s, 'bibliogram.art'),
         "www.amazon.com": o(s, 'smile.amazon.com'),
         "imgur.com" : o(s, 'imgin.voidnet.tech'),
-        "medium.com" : o(s, 'scribe.rip')
+        "medium.com" : o(s, 'scribe.rip'),
+        "www.twitch.tv" : o(s, 'm.twitch.tv'),
+        "discord.com" : o(s, 'canary.discord.com')
     }
 def f(info: i.Request):
     if (info.resource_type != i.ResourceType.main_frame or
diff --git a/qutebrowser/user.css b/qutebrowser/user.css
new file mode 100644
index 0000000..8318a19
--- /dev/null
+++ b/qutebrowser/user.css
@@ -0,0 +1,23 @@
+#hnmain { background: #212121; zoom: 120%; }
+#hnmain td[bgcolor="#ff6600"] { background: #4b5762; }
+
+#app-mount {
+    --background-primary: transparent;
+    --background-secondary: transparent;
+    --background-secondary-alt: transparent;
+    --background-tertiary: transparent;
+    --background-floating: rgba(0, 0, 0, .6);
+    --channeltextarea-background: transparent;
+    font-family: "Ubuntu Mono";
+    background: url(
+    "https://cdn.discordapp.com/attachments/773556458234052608/929383713932992512/0dKbZO5-16-9.webp"
+);}
+
+#app-mount [aria-label="Channels"] div [class^="unread"] { background-color: #cfcdcf; }
+#app-mount [class^="container"] { background-color: transparent; }
+
+#app-mount [aria-label$="sidebar"], #app-mount [aria-label="Inbox"],
+#app-mount [class^="privateChannels"] [class^="searchBar"], #app-mount [href="/store"],
+#app-mount [aria-label$="gift"], #app-mount [aria-label="Help"] { display: none }
+
+.app-container .doc-container .doc div { max-width: 666pt !important; margin: auto; }