vifm: colorscheme + sixel script

3 files changed, 66 insertions, 24 deletions

diff --git a/.config/vifm/colors/papercolor_dark.vifm b/.config/vifm/colors/papercolor_dark.vifm
index 634ac97..ec68d53 100644
--- a/.config/vifm/colors/papercolor_dark.vifm
+++ b/.config/vifm/colors/papercolor_dark.vifm
@@ -5,26 +5,23 @@
 " standout
 " none
 
-" let s:palette = {
-" \       'color00' : ['#1c1c1c', '234'],
-" \       'color01' : ['#af005f', '125'],
-" \       'color02' : ['#5faf00', '70'],
-" \       'color03' : ['#d7af5f', '179'],
-" \       'color04' : ['#5fafd7', '74'],
-" \       'color05' : ['#808080', '244'],
-" \       'color06' : ['#d7875f', '173'],
-" \       'color07' : ['#d0d0d0', '252'],
-" \       'color08' : ['#585858', '240'],
-" \       'color09' : ['#5faf5f', '71'],
-" \       'color10' : ['#afd700', '148'],
-" \       'color11' : ['#af87d7', '140'],
-" \       'color12' : ['#ffaf00', '214'],
-" \       'color13' : ['#ff5faf', '205'],
-" \       'color14' : ['#00afaf', '37'],
-" \       'color15' : ['#5f8787', '66'],
-" \       'color16' : ['#5fafd7', '74'],
-" \       'color17' : ['#d7af00', '178'],
-" \ }
+" palette
+let color00 = '#1c1c1c'
+let color01 = '#e03c8a'
+let color02 = '#90b44b'
+let color03 = '#caad5f'
+let color04 = '#58b2dc'
+let color05 = '#828282'
+let color06 = '#e3916e'
+let color07 = '#bdc0ba'
+let color08 = '#535953'
+let color09 = '#86c166'
+let color10 = '#ddd23b'
+let color11 = '#b28fce'
+let color12 = '#ffb11b'
+let color13 = '#66bab7'
+let color14 = '#77969a'
+let color15 = '#fffffb'
 
 highlight clear
 
diff --git a/.config/vifm/scripts/vifm-show-sixel b/.config/vifm/scripts/vifm-show-sixel
new file mode 100755
index 0000000..1644153
--- /dev/null
+++ b/.config/vifm/scripts/vifm-show-sixel
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -e
+
+if [ "$#" -ne 3 ]; then
+    echo "Usage: $0 filename width height"
+    exit 1
+fi
+
+dim=( $(convert "$1" -format "%w %h" info:) )
+w=${dim[0]}
+h=${dim[1]}
+
+pw=$(($2*8))
+ph=$(($3*14))
+
+height=auto
+width=auto
+if [ $pw -lt $w ] && [ $ph -lt $h ]; then
+    newh=$(echo "($h*$pw)/$w" | bc)
+    neww=$(echo "($w*$ph)/$h" | bc)
+
+    if [ $newh -le $ph ]; then
+        width=$pw
+    else
+        height=$ph
+    fi
+elif [ $pw -lt $w ]; then
+    width=$pw
+elif [ $ph -lt $h ]; then
+    height=$ph
+fi
+
+# debugging stuff
+# echo pw=$pw ph=$ph
+# echo w=$w h=$h
+# echo neww=$neww newh=$newh
+# exec echo width=$width height=$height
+
+# account for GNU screen
+if [ -n "$STY" ]; then
+    popt=-P
+fi
+
+exec img2sixel $popt --width=$width --height=$height "$1"
diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc
index 18da8dd..539d4b4 100644
--- a/.config/vifm/vifmrc
+++ b/.config/vifm/vifmrc
@@ -1,6 +1,6 @@
 " vim: filetype=vim :
 
-colorscheme papercolor_dark
+colorscheme nihoncolors
 
 set vicmd=nvim
 set trash
@@ -120,7 +120,7 @@ filetype *.[1-8] man ./%c
 fileviewer *.[1-8] man ./%c | col -b
 
 " Images
-filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm
+filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm,*.webp
         \ {View in mvi}
         \ mvi %c,
         \ {View in imv}
@@ -128,9 +128,9 @@ filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm
         \ {View in terminal}
         \ icat %c %pw %ph %pd,
         \ {Edit with GIMP}
-        \ gimp %c &,
+        \ gimp.AppImage %c &
 fileviewer *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm
-         \  icat %c %pw %ph %pd || mediainfo %c 2>&1
+         \  vifm-show-sixel %c %pw %ph %pd 2>/dev/null || mediainfo %c 2>&1
 
 " MD5
 filetype *.md5