From 365644078bb155f2982466801b745da178103221 Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Thu, 11 Jan 2024 19:34:37 -0500
Subject: [PATCH] various package and page changes

---
 archpkgs                 | 13 +++++++++++--
 git/config               |  2 +-
 qutebrowser/bindings.py  |  2 +-
 qutebrowser/config.py    |  2 +-
 qutebrowser/redirects.py |  7 ++++---
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/archpkgs b/archpkgs
index 59a473a..a6a5cda 100644
--- a/archpkgs
+++ b/archpkgs
@@ -62,6 +62,8 @@ keepassxc
 kitty
 kvantum
 lagrange
+lib32-libpulse
+lib32-vulkan-icd-loader
 libheif
 libplist
 libpulse
@@ -71,7 +73,6 @@ libva-intel-driver
 linux-firmware
 linux-hardened
 lrzip
-lxqt-archiver
 ly
 lynx
 man-pages
@@ -99,13 +100,14 @@ opus-tools
 oxipng
 p7zip
 parallel
-pcmanfm-qt
+pcmanfm-gtk3
 perl-parallel-forkmanager
 php
 picocom
 pipewire
 pngquant
 poppler
+postgresql-libs
 power-profiles-daemon
 powertop
 pulseaudio
@@ -118,6 +120,7 @@ python-adblock
 python-html2text
 python-pip
 python-pipx
+python-pylint
 python-readability-lxml
 qownnotes
 qpdf
@@ -128,6 +131,7 @@ rclone
 ripgrep-all
 rofi
 rsync
+runc
 smartmontools
 sof-firmware
 squashfs-tools
@@ -143,6 +147,7 @@ torsocks
 ttf-dejavu
 ttf-ubuntu-font-family
 tuc
+typst
 unzip
 upx
 usbutils
@@ -153,13 +158,17 @@ w3m
 waifu2x-ncnn-vulkan
 webp-pixbuf-loader
 wget
+wine
+winetricks
 wqy-microhei
+xarchiver
 xdelta3
 xdg-utils
 xf86-input-evdev
 xf86-input-libinput
 xorg-server
 xorg-xinit
+xreader
 xsel
 yay
 yt-dlp
diff --git a/git/config b/git/config
index 033b2f3..89531b5 100644
--- a/git/config
+++ b/git/config
@@ -46,7 +46,7 @@
     caa = ca -a
     ch = checkout
     cl = gc --aggressive --prune=now
-    d = difftool
+    d = diff
     g = clone
     gr = clone --recursive
     l = log
diff --git a/qutebrowser/bindings.py b/qutebrowser/bindings.py
index ccc52b9..837d0da 100644
--- a/qutebrowser/bindings.py
+++ b/qutebrowser/bindings.py
@@ -38,7 +38,7 @@ bind = {
     'E': 'config-cycle -p content.javascript.enabled ;; reload',
     's1': 'download-open',
     'sa': 'open -t archive.is/submit/?url={url}',
-    'sb': 'open splashblr.fly.dev/?u={url}',
+    'sb': 'open tumblash.fly.dev/?u={url}',
     'sc': 'toggle-dark',
     'sd': "spawn fish -c 'dl; open (ls -a | rofi -dmenu -b -i || exit 0)'",
     'sg': 'debug-dump-page ~/Downloads/dump.html',
diff --git a/qutebrowser/config.py b/qutebrowser/config.py
index ffe1ab9..5998369 100644
--- a/qutebrowser/config.py
+++ b/qutebrowser/config.py
@@ -15,7 +15,7 @@ c.url.searchengines['s'] = 'farside.link/searxng/search?q={}'
 c.url.searchengines['x'] = 'aldeid.com/wiki/X86-assembly/Instructions/{}'
 c.url.searchengines['y'] = 'farside.link/invidious/search?q={}'
 c.url.searchengines['z'] = 'zeldawiki.wiki/wiki/{}'
-c.url.searchengines['DEFAULT'] = c.url.searchengines['4']
+c.url.searchengines['DEFAULT'] = c.url.searchengines['s']
 c.url.start_pages = c.url.default_page = 'minifocs.fly.dev'
 
 config.source('adblock.py')
diff --git a/qutebrowser/redirects.py b/qutebrowser/redirects.py
index 5f4cd02..94a7f1d 100644
--- a/qutebrowser/redirects.py
+++ b/qutebrowser/redirects.py
@@ -50,6 +50,7 @@ map = {
 
         "twitter.com": nitter,
         "mobile.twitter.com": nitter,
+        "x.com": nitter,
 
         "imgur.com" : rimgo,
         "medium.com" : scribe,
@@ -63,10 +64,10 @@ map = {
         "genius.com" : dumb,
         "stackoverflow.com" : anonymousoverflow,
 
-        "www.twitch.tv" : o(s, 'm.twitch.tv'),
+        "www.twitch.tv" : o(s, 'twineo.deno.dev'),
         "discord.com" : o(s, 'canary.discord.com'),
-        "tumblr.com" : o(s, 'splashblr.fly.dev'),
-        "www.tumblr.com" : o(s, 'splashblr.fly.dev'),
+        "tumblr.com" : o(s, 'tumblash.fly.dev'),
+        "www.tumblr.com" : o(s, 'tumblash.fly.dev'),
         "www.npr.org" : o(s, 'text.npr.org'),
         "www.goodreads.com" : o(s, 'bl.vern.cc'),
         "zelda.fandom.com" : o(s, 'zeldawiki.wiki'),