From 176a4a233d751b4a3e07e455c0db494c8c751a0f Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Wed, 18 Aug 2021 22:33:12 +0200
Subject: [PATCH] vifm: Obey XDG Trash directory

Moved trash directory vifm uses from its own data location to the one
proposed by XDG specification. Essentially moves it to
`.local/share/Trash`.
---
 nvim/.config/nvim/spell/en.utf-8.add |  7 +++++++
 vifm/.config/vifm/vifmrc             | 22 ++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/nvim/.config/nvim/spell/en.utf-8.add b/nvim/.config/nvim/spell/en.utf-8.add
index 3fe5087..c14d756 100644
--- a/nvim/.config/nvim/spell/en.utf-8.add
+++ b/nvim/.config/nvim/spell/en.utf-8.add
@@ -102,3 +102,10 @@ Anthropocene
 ecotourism
 legitimation
 wellbeing
+harkens
+Sossusvlei
+Kulala
+reframed
+dichotomized
+presentational
+dichotomization
diff --git a/vifm/.config/vifm/vifmrc b/vifm/.config/vifm/vifmrc
index 24c427b..f212d58 100644
--- a/vifm/.config/vifm/vifmrc
+++ b/vifm/.config/vifm/vifmrc
@@ -30,6 +30,7 @@ set syscalls
 " I recommend not changing this until you are familiar with vifm.
 " This probably shouldn't be an option.
 set trash
+set trashdir=$XDG_DATA_HOME/Trash
 
 " This is how many directories to store in the directory history.
 set history=100
@@ -39,7 +40,7 @@ set nofollowlinks
 
 " With this option turned on you can run partially entered commands with
 " unambiguous beginning using :! (e.g. :!Te instead of :!Terminal or :!Te<tab>).
-" set fastrun
+set fastrun
 
 " Natural sort of (version) numbers within text.
 set sortnumbers
@@ -123,7 +124,7 @@ mark v ~/media/videos/
 mark n ~/documents/notes/
 mark N ~/Nextcloud/
 mark l ~/documents/library/academia/pdf/
-mark t ~/.local/share/vifm/Trash/
+mark t ~/.local/share/Trash/
 
 " }}}
 " Commands {{{
@@ -393,20 +394,25 @@ fileviewer *.[1-8] man ./%c | col -b
 
 " Gif
 filextype *.gif
-  \ {Loop} mpv --loop=inf %f %i &,
+        \ {Loop}
+        \ mpv --loop=inf %f %i &,
+fileviewer *.gif
+        \ vifmimg draw %px %py %pw %ph %c
+        \ %pc
+        \ vifmimg clear
 
 " Images
 filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm
         \ {View in sxiv}
         \ sxiv %f,
+        \ {View in feh}
+        \ feh -FZ %d --start-at %d/%c 2>/dev/null
         \ {View in gpicview}
         \ gpicview %c,
-        \ {View in shotwell}
-        \ feh,
 fileviewer *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm
-         \ vifmimg draw %px %py %pw %ph %c
-         \ %pc
-         \ vifmimg clear
+        \ vifmimg draw %px %py %pw %ph %c
+        \ %pc
+        \ vifmimg clear
 
 " OpenRaster
 filextype *.ora