Revert "Trying out vimb as main browser"

This reverts commit a76aa8c932030a64ba277ed9a9cbeadb8dd910d2.
And makes changes to adapt qutebrowser history to menuwebsurf.

Sorry vimb, you are nice and I like that you are really minimal. But
even though qb is written in Python, it still manages to work better
than you (even though slower on startup).

4 files changed, 22 insertions, 11 deletions

diff --git a/dotfiles/.config/mimeapps.list b/dotfiles/.config/mimeapps.list
index 9d207f7..b230d15 100644
--- a/dotfiles/.config/mimeapps.list
+++ b/dotfiles/.config/mimeapps.list
@@ -1,9 +1,9 @@
 [Default Applications]
 application/pdf=org.pwmt.zathura-pdf-mupdf.desktop;
 application/epub+zip=org.pwmt.zathura-pdf-mupdf.desktop;
-application/rdf+xml=vimb.desktop;
-application/xhtml+xml=vimb.desktop;
-application/xml=vimb.desktop;
+application/rdf+xml=org.qutebrowser.qutebrowser.desktop;
+application/xhtml+xml=org.qutebrowser.qutebrowser.desktop;
+application/xml=org.qutebrowser.qutebrowser.desktop;
 audio/mpeg=mpv.desktop;
 audio/x-xm=mpv.desktop;
 audio/x-mod=mpv.desktop;
@@ -12,12 +12,12 @@ image/jpeg=sxiv.desktop;
 image/png=sxiv.desktop;
 image/webp=sxiv.desktop;
 image/svg+xml=org.inkscape.Inkscape.desktop
-text/html=vimb.desktop;
+text/html=org.qutebrowser.qutebrowser.desktop;
 text/xml=nvim.desktop;
 text/plain=nvim.desktop;
 x-scheme-handler/discord-589393213723246592=discord-589393213723246592.desktop;
-x-scheme-handler/http=vimb.desktop;
-x-scheme-handler/https=vimb.desktop;
+x-scheme-handler/http=org.qutebrowser.qutebrowser.desktop;
+x-scheme-handler/https=org.qutebrowser.qutebrowser.desktop;
 x-scheme-handler/qute=org.qutebrowser.qutebrowser.desktop;
 x-scheme-handler/discord-455712169795780630=discord-455712169795780630.desktop
 x-scheme-handler/mailto=neomutt.desktop
diff --git a/dotfiles/.local/bin/menuwebsurf b/dotfiles/.local/bin/menuwebsurf
index cb32299..9e1a7a9 100755
--- a/dotfiles/.local/bin/menuwebsurf
+++ b/dotfiles/.local/bin/menuwebsurf
@@ -6,19 +6,24 @@
 . ~/.config/bemenurc
 
 searchurl="https://srx.yaroslavps.com/search?q="
-histf="$HOME/.config/vimb/history"
 
 # Have to use this "hack" because bemenu doesn't know how to paste
 if [ "$1" = "paste" ]; then
 	prompt="$(wl-paste)"
 else
-	prompt="$(cat "$histf")"
+	qmarks="$HOME/.config/qutebrowser/quickmarks"
+	hist="$HOME/.local/share/qutebrowser/history.sqlite"
+	prompt="$(sqlite3 -separator ' ' "$hist" \
+		'select title, url from CompletionHistory' |
+		cat "$qmarks" -)"
 fi
 
-choice=$(printf "%s" "$prompt" | bemenu -i -l 25 -p "Enter link or query:" --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB" --monitor="$BEMENU_MONITOR") || exit 1
+choice=$(printf "%s" "$prompt" |
+	bemenu -i -l 25 -p "Enter link or query:" --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB" --monitor="$BEMENU_MONITOR") || exit 1
 
 if echo "$choice" | egrep ".*://.*" >/dev/null 2>&1; then
-	choice="$(echo "$choice" | cut -f 1)"
+	choice="$(echo "$choice" | sed -E 's/[^ ]+ +//g' | 
+		grep -E "https?:" || echo "$choice")"
 	mimeo "$choice"
 else
 	$BROWSER "$choice"
diff --git a/dotfiles/.local/share/applications/neomutt.desktop b/dotfiles/.local/share/applications/neomutt.desktop
new file mode 100644
index 0000000..326ccfc
--- /dev/null
+++ b/dotfiles/.local/share/applications/neomutt.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=neomutt
+GenericName=Email Client
+Exec=neomutt %u
+Terminal=true
+MimeType=x-scheme-handler/mailto
diff --git a/dotfiles/.profile b/dotfiles/.profile
index 4db0bac..7d6f809 100644
--- a/dotfiles/.profile
+++ b/dotfiles/.profile
@@ -17,7 +17,7 @@ export LANG=en_US.UTF-8
 export TERMINAL=foot
 export EDITOR="nvim"
 export PAGER="less -R -j.5"
-export BROWSER=vimb
+export BROWSER=qutebrowser
 
 # Sanely export XDG Base dir variables
 eval "$(sed 's/^[^#].*/export &/g;t;d' ~/.config/user-dirs.dirs)"