From 3c45381f0a7bebd299c84bc24af8ab9847a6d6cd Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Wed, 17 Jun 2020 12:05:49 +0000
Subject: [PATCH] use emacsclient as terminal editor and mpv for mailcap

---
 all-shells/.commonshell |    3 ++-
 aspell/.aspell.en.pws   |    3 ++-
 mailcap/.mailcap        |    4 ++--
 emacs/.emacs.d          |    2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/all-shells/.commonshell b/all-shells/.commonshell
index 36f5d44..366587c 100644
--- a/all-shells/.commonshell
+++ b/all-shells/.commonshell
@@ -6,7 +6,8 @@
 alias less='less -r'
 alias stats="find . -type f -printf '%f\n' | sed -r -n 's/.+(\..*)$/\1/p' | sort | uniq -c"
 
-export EDITOR=/usr/bin/vim
+export EDITOR="/usr/bin/emacsclient -nw -a /usr/bin/vim"
+alias ec=$EDITOR
 
 #default wine prefix
 export WINEPREFIX=$HOME/.wine/Games/
diff --git a/aspell/.aspell.en.pws b/aspell/.aspell.en.pws
index 49b4277..ea63a96 100644
--- a/aspell/.aspell.en.pws
+++ b/aspell/.aspell.en.pws
@@ -1,9 +1,10 @@
-personal_ws-1.1 en 22 
+personal_ws-1.1 en 23 
 DNS
 FPGA
 GPIO
 Grunbaum
 SODIMM
+abortifacient
 config
 dotfiles
 fortifiable
diff --git a/emacs/.emacs.d b/emacs/.emacs.d
index b0ee5f8..0a6cd2a 160000
--- a/emacs/.emacs.d
+++ b/emacs/.emacs.d
@@ -1 +1 @@
-Subproject commit b0ee5f8ba34e6a7521727c090476fbe2f5b78b1f
+Subproject commit 0a6cd2a41136263a2ffbe46c3ba1d321a033567f
diff --git a/mailcap/.mailcap b/mailcap/.mailcap
index 9c6a9d5..1a01990 100644
--- a/mailcap/.mailcap
+++ b/mailcap/.mailcap
@@ -31,8 +31,8 @@
 
 # Youtube videos are assigned a custom mime-type, which can be streamed with
 # vlc or youtube-dl.
-video/x-youtube; vlc '%s' --width 640 --height 480; test=test -n "$DISPLAY"
-video/x-youtube; mpv --ytdl-format=bestvideo+bestaudio/best '%s' --autofit 640x480; test=test -n "$DISPLAY"
+#video/x-youtube; vlc '%s' --width 640 --height 480; test=test -n "$DISPLAY"
+video/x-youtube; mpv '%s'
 
 # Mpv is a simple and effective video streamer
 video/*; mpv '%s' --autofit 640x480 --loop=inf; test=test -n "$DISPLAY"

--
Gitblit v1.9.3