From 97138babaddeee97d3025cd054c61f833d925531 Mon Sep 17 00:00:00 2001 From: Phantop Date: Fri, 9 Sep 2022 14:54:48 -0400 Subject: [PATCH] qute: fly, cookies everywhere; setup: nnn, lrzip; fish: more paths --- bin/aliases | 5 ++--- bin/setup | 24 ++++++++++-------------- fish/bashrc | 10 ---------- fish/config.fish | 2 +- qutebrowser/bindings.py | 1 + qutebrowser/config.py | 6 +++--- qutebrowser/redirects.py | 13 +++++++++---- qutebrowser/sites.py | 2 +- 8 files changed, 27 insertions(+), 36 deletions(-) delete mode 100644 fish/bashrc diff --git a/bin/aliases b/bin/aliases index 87602a8..f4bcd7a 100755 --- a/bin/aliases +++ b/bin/aliases @@ -30,7 +30,6 @@ a l ls a la 'l -A' a launcher 'rofi -combi-modi "drun,run" -show combi -modi "combi,window"' a listen 'pactl list | grep loop && set t un; pactl "$t"load-module module-loopback' -a ncdu 'ncdu --color off --graph-style hash' a nix 'replay . ~/.nix-profile/etc/profile.d/nix.sh; command nix' a nsp 'netsurf (pandoc $argv -s -t html | psub -s .html);:' a nsmd 'netsurf (md2html $argv | psub -s .html);:' @@ -57,7 +56,7 @@ a venv 'python3 -m venv venv && source venv/bin/activate.fish && pip3 install -r a vi nvim a wallp 'gsettings set org.gnome.desktop.background picture-uri file://(realpath $argv);:' a wm 'startx (which $argv[1]) $argv[2..-1]' -a ydl 'while not yt-dlp $argv; end;:' +a ydl 'yt-dlp' a 7zstd '7z a -m0=zstd -mx22 -mmt=8 -mfb=273 -md=256m -ms=on (realpath $argv[1]).7z' a compress '7z a -m0=flzma2 -mx9 -mmt=8 -mfb=273 -md=256m -ms=on (realpath $argv[1]).7z' @@ -73,7 +72,7 @@ a xcompress 'fxz -T0 -9 -k' a zipmount 'fuse-zip -f $argv (mktemp -d | tee /dev/tty /dev/stderr 2>| clip);:' for i in (cat ~/.config/qutebrowser/quickmarks | cut -d ' ' -f1) - a $i "qutebrowser-profile --load $i \":open $i\"" + a $i "qutebrowser / \":open $i\"" end for i in deemix nsz scdl soundscrape spleeter diff --git a/bin/setup b/bin/setup index a87ef0c..7779f43 100755 --- a/bin/setup +++ b/bin/setup @@ -5,36 +5,32 @@ alias s=sudo se="s eopkg -y" g=git gnome="gnome-photos gnome-mpv gnome-terminal nautilus rhythmbox" se rm $gnome firefox libreoffice-common onboard thunderbird -dev="arcanist ccache git-extras llvm-clang neovim parallel qt-creator solbuild" -gui="caja gimp keepassxc kitty nicotine-plus qutebrowser syncthing zathura-mupdf" -med="audacity audacious avidemux mkvtoolnix mpv opus-tools spek yt-dlp" -ric="ant-dracula-gtk-theme autojump font-ubuntu-ttf rofi starship sassc stow" -tui="advancecomp aria2 fd fish fzf innoextract jpegoptim moreutils ncdu ripgrep tig" -sys="bleachbit corectrl ifuse linux-tools-cpupower p7zip tlp usbmuxd upx tor" -se up; se it -c system.devel $dev $gui $med $ric $sys $tui +a="advancecomp arcanist aria2 audacious audacity avidemux bleachbit caja ccache" +b="corectrl fd fish fzf gimp git-extras ifuse innoextract jpegoptim keepassxc kitty" +c="linux-tools-cpupower llvm-clang lrzip mkvtoolnix moreutils mpv ncdu neovim" +d="nicotine-plus nnn opus-tools p7zip parallel qt-creator qutebrowser ripgrep" +e="solbuild spek syncthing tig tlp tor upx usbmuxd yt-dlp zathura-mupdf" +se up; se it -c system.devel $a $b $c $d $e +pip3 install adblock pipx-in-pipx readability-lxml stow --no-folding -d ~/.dotfiles -t ~/.config . -stow --no-folding -d ~/.dotfiles -t ~/.local/bin bin -mkdir -p ~/.parallel/will-cite -echo source ~/.config/fish/bashrc > ~/.bashrc ln -s ~/.config/gtk-3.0/gtkrc ~/.gtkrc-2.0 +mkdir -p ~/.parallel/will-cite -wget https://github.com/dracula/kitty/raw/master/dracula.conf -P ~/.config/kitty wget https://github.com/dracula/rofi/raw/master/theme/config2.rasi -P ~/.config/rofi +wget https://github.com/mrzool/bash-sensible/raw/master/sensible.bash -O ~/.bashrc wget https://github.com/savq/paq-nvim/raw/master/lua/paq.lua -P ~/.config/nvim/lua -wget https://github.com/mrzool/bash-sensible/raw/master/sensible.bash -P ~/.local/bin +wget https://github.com/dracula/kitty/raw/master/dracula.conf -P ~/.config/kitty wget https://source.netsurf-browser.org/netsurf.git/plain/resources/adblock.css\ https://nitter.it/css/themes/dracula.css -P ~/.config/qutebrowser 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 -pip3 install adblock pipx-in-pipx readability-lxml chsh -s "$(which fish)" fish -c "aliases;clean" s usermod -aG docker "$USER" -s systemctl mask tracker-store tracker-miner-fs tracker-miner-rss tracker-miner-apps tracker-extra tracker-writeback g g p:appdwarf ~/.appdwarf g g p:solus-stuff ~/.solus diff --git a/fish/bashrc b/fish/bashrc deleted file mode 100644 index 1474ef6..0000000 --- a/fish/bashrc +++ /dev/null @@ -1,10 +0,0 @@ -source /usr/share/autojump/autojump.bash -source /usr/share/defaults/etc/profile - -# Sensible Bash: https://github.com/mrzool/bash-sensible -source $(which sensible.bash) - -#aliases -eval alias $(fish -c alias | cut -d' ' -f2- | sed 's/ /=/' | sed 's/(/$(/g' | sed 's/argv/@/g') - -eval "$(starship init bash)" diff --git a/fish/config.fish b/fish/config.fish index b820eac..0696628 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -1,4 +1,4 @@ -fish_add_path -g ~/{.local,Games}/bin /usr/lib64/ccache/bin +fish_add_path -g ~/.appdwarf/{,apps} ~/{.dotfiles,.local,,Games}/bin /usr/lib64/ccache/bin export EDITOR=nvim MANPAGER='nvim +Man!' USE_CCACHE=1 set fish_greeting diff --git a/qutebrowser/bindings.py b/qutebrowser/bindings.py index d27ad0d..f7083ad 100644 --- a/qutebrowser/bindings.py +++ b/qutebrowser/bindings.py @@ -44,6 +44,7 @@ bind = { 'T' : 'tab-next', 'td': 'config-unset -u {url:host} content.headers.user_agent', 'W': 'config-cycle -p -u *://*.{url:host}/* content.cookies.accept no-3rdparty all never', + '': 'config-cycle -p content.cookies.accept no-3rdparty never', } for a, b in bind.items(): config.bind(a, b) diff --git a/qutebrowser/config.py b/qutebrowser/config.py index 7bfe579..d42a99e 100644 --- a/qutebrowser/config.py +++ b/qutebrowser/config.py @@ -12,12 +12,12 @@ c.downloads.location.directory = '~/Downloads' c.qt.workarounds.remove_service_workers = True c.url.searchengines['DEFAULT'] = 'farside.link/searxng/search?q={}' -c.url.searchengines['l'] = 'search.davidovski.xyz/search.php?q={}' +c.url.searchengines['l'] = 'farside.link/librex/search.php?q={}' c.url.searchengines['m'] = 'morty.ononoki.org/?mortyurl={}' c.url.searchengines['t'] = 'ao3.org/tags/{}' c.url.searchengines['y'] = 'farside.link/invidious/search?q={}' -c.url.searchengines['!'] = 'duckduckgo.com/?q=!{}' -c.url.start_pages = c.url.default_page = 'https://megafocs.herokuapp.com' +c.url.searchengines['!'] = 'duck.com/?q=!{}' +c.url.start_pages = c.url.default_page = 'megafocs.fly.dev' config.source('adblock.py') config.source('bindings.py') diff --git a/qutebrowser/redirects.py b/qutebrowser/redirects.py index 25cf817..86cb5cf 100644 --- a/qutebrowser/redirects.py +++ b/qutebrowser/redirects.py @@ -29,8 +29,12 @@ def bibliogram(url: QUrl) -> bool: return farside(url, '/bibliogram/') def simplytranslate(url: QUrl) -> bool: return farside(url, '/simplytranslate/') +def proxitok(url: QUrl) -> bool: + return farside(url, '/proxitok/') +def querte (url: QUrl) -> bool: + return farside(url, '/querte/') -MAP = { +map = { "reddit.com": reddit, "www.reddit.com": reddit, "old.reddit.com": reddit, @@ -47,11 +51,12 @@ MAP = { "en.wikipedia.org" : wikiless, "www.instagram.com": bibliogram, "translate.google.com" : simplytranslate, + "vm.tiktok.com" : proxitok, + "www.quora.com": querte, "www.twitch.tv" : o(s, 'm.twitch.tv'), "discord.com" : o(s, 'canary.discord.com'), - "vm.tiktok.com" : o(s, 'proxitok.herokuapp.com'), - "tumblr.com" : o(s, 'splashblr.herokuapp.com'), + "tumblr.com" : o(s, 'splashblr.fly.dev'), "www.npr.org" : o(s, 'text.npr.org'), } def f(info: i.Request): @@ -59,7 +64,7 @@ def f(info: i.Request): info.request_url.scheme() in {"data", "blob"}): return url = info.request_url - redir = MAP.get(url.host()) + redir = map.get(url.host()) if redir is not None and redir(url) is not False: info.redirect(url) i.register(f) diff --git a/qutebrowser/sites.py b/qutebrowser/sites.py index 5e6b361..30c8d52 100644 --- a/qutebrowser/sites.py +++ b/qutebrowser/sites.py @@ -6,7 +6,7 @@ sites = [ 'archiveofourown.org', 'canary.discord.com', '*.tutanota.com', - 'megafocs.herokuapp.com', + c.url.default_page, '*.rpi.edu', 'api-3e0243bb.duosecurity.com',