From 6d95e26dac123d6bf179279079f6aeb3ef751d66 Mon Sep 17 00:00:00 2001
From: Ryan Kes <alrayyes@gmail.com>
Date: Fri, 31 May 2019 16:06:39 +0200
Subject: [PATCH] Removed feh

---
 README.md                               |  1 -
 feh/.config/feh/keys                    | 45 -------------------------
 feh/.config/firejail/feh.profile        | 21 ------------
 vifm/.local/bin/switch-background-image |  8 ++++-
 4 files changed, 7 insertions(+), 68 deletions(-)
 delete mode 100644 feh/.config/feh/keys
 delete mode 100644 feh/.config/firejail/feh.profile

diff --git a/README.md b/README.md
index 3edf20e..2b0024f 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,6 @@ A repository of my personal configuration files.
 # Packages Configured
 
 * [dunst](https://dunst-project.org/)
-* [feh](https://linux.die.net/man/1/feh)
 * [firejail](https://firejail.wordpress.com/)
 * [git](https://git-scm.com/)
 * [gnupg](https://gnupg.org/)
diff --git a/feh/.config/feh/keys b/feh/.config/feh/keys
deleted file mode 100644
index d221d29..0000000
--- a/feh/.config/feh/keys
+++ /dev/null
@@ -1,45 +0,0 @@
-# feh key configuration.
-# Comments start with a # sign, do not use them mid-line.
-# Each line must be blank, a comment, or a key definition.
-#
-# key definition: <action name> <key1> [<key2> [<key3>]]
-#
-# Each <key> is an X11 keysym (as output by xev) with optional modifier.
-# For instance, C-x would be Ctrl+X, or 4-space Mod4+Space
-
-# Examples for vim-like menu bindings on a qwerty keyboard:
-menu_parent h Left
-menu_child  l Right
-menu_down   j Down
-menu_up     k Up
-menu_select space Return
-
-# Same for image navigation ...
-next_img j Right space
-prev_img k Left BackSpace
-
-# and image movement
-scroll_up    J C-Up
-scroll_down  K C-Down
-scroll_left  H C-Left
-scroll_right L C-Right
-
-# File deletion
-remove     d   Delete
-delete   C-d C-Delete
-
-# remove now conflicts with toggle_filenames, so change that
-toggle_filenames f
-
-# zooming
-zoom_in  C-Up f
-zoom_out C-Down a
-zoom_default d
-zoom_fit s
-
-# I only hit these accidentaly
-save_image
-save_filelist
-
-# This leaves some conflicts with existing default bindings, but you should
-# get the idea.  And I'm not gonna fix the conflicts, I don't use qwerty ;-)
diff --git a/feh/.config/firejail/feh.profile b/feh/.config/firejail/feh.profile
deleted file mode 100644
index b19f817..0000000
--- a/feh/.config/firejail/feh.profile
+++ /dev/null
@@ -1,21 +0,0 @@
-# feh image viewer profile
-include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-passwdmgr.inc
-
-caps.drop all
-seccomp
-protocol unix,inet
-netfilter
-#net none
-nonewprivs
-noroot
-nogroups
-nosound
-shell none
-
-private-bin feh
-whitelist /tmp/.X11-unix
-private-dev
-#private-etc feh,ld.so.cache,ld.so.preload,localtime,nsswitch.conf,host.conf,resolv.conf,gai.conf,hosts
diff --git a/vifm/.local/bin/switch-background-image b/vifm/.local/bin/switch-background-image
index 8072900..6c831c8 100755
--- a/vifm/.local/bin/switch-background-image
+++ b/vifm/.local/bin/switch-background-image
@@ -21,6 +21,12 @@ echo "Resizing ${OUTPUT_IMAGE} to ${WIDTH}x${HEIGHT}"
 convert "${OUTPUT_IMAGE}" -resize "${WIDTH}x${HEIGHT}^" -gravity center -extent "${WIDTH}"x"${HEIGHT}" "${OUTPUT_IMAGE}"
 
 echo "Setting background images...."
-feh --bg-scale ~/.cache/wall1.png --bg-scale ~/.cache/wall2.png
+if [ -e ~/.cache/wall1.png ] &&  [ -e ~/.cache/wall2.png ]
+then
+    xwallpaper --output HDMI-2 --zoom ~/.cache/wall2.png --output DP-1 --zoom ~/.cache/wall1.png &
+elif [ -e ~/.cache/wall1.png ]
+then
+    xwallpaper --output eDP1 --zoom ~/.cache/wall1.png &
+fi
 
 echo "done!"